Author: Alastair McKinstry Description: Add compiler flags explicity; needed for fortified compilation. Last-Updated: 2013-05-18 Forwarded: no Index: libsx-2.05/bezier/makefile =================================================================== --- libsx-2.05.orig/bezier/makefile 2013-05-19 03:34:58.000000000 +0100 +++ libsx-2.05/bezier/makefile 2013-05-19 04:32:03.000000000 +0100 @@ -8,8 +8,7 @@ OBJS = main.o callbacks.o bezier.o gfx.o bez : $(OBJS) - $(CC) -o bez $(OBJS) $(LIBS) $(LOCAL_LIBS) - + $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o bez $(OBJS) $(LIBS) $(LOCAL_LIBS) # main.o depends on main.c (of course) and main.h and callbacks.h main.o : main.c main.h callbacks.h gfx.h Index: libsx-2.05/freq/makefile =================================================================== --- libsx-2.05.orig/freq/makefile 2013-05-19 03:34:58.000000000 +0100 +++ libsx-2.05/freq/makefile 2013-05-19 04:33:24.000000000 +0100 @@ -9,7 +9,6 @@ all : libfreq.a freq libsimplefreq.a simple_freq - libfreq.a : $(FREQ_OBJS) rm -f libfreq.a ar rc libfreq.a $(FREQ_OBJS) @@ -21,10 +20,10 @@ $(RANLIB) libsimplefreq.a freq : $(OBJS) - $(CC) -o $@ $(OBJS) $(LIBS) + $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) simple_freq : $(SIMPLE_OBJS) - $(CC) -o $@ $(SIMPLE_OBJS) $(LIBS) + $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $(SIMPLE_OBJS) $(LIBS) main.o : main.c freq.h Index: libsx-2.05/src/Makefile =================================================================== --- libsx-2.05.orig/src/Makefile 2013-05-19 03:34:58.000000000 +0100 +++ libsx-2.05/src/Makefile 2013-05-19 04:28:00.000000000 +0100 @@ -26,7 +26,10 @@ # %.pic: %.c - $(CC) -c -o $@ $(CFLAGS) -fPIC $< + $(CC) $(CPPFLAGS) -c -o $@ $(CFLAGS) -fPIC $< + +%.o: %.c + $(CC) $(CPPFLAGS) -c -o $@ $(CFLAGS) $< LIBSXOBJS := draw.o toggle.o button.o string_entry.o libsx.o misc.o list.o\ font.o scrollbar.o menu.o popups.o colormap.o drawing.o\ @@ -45,7 +48,7 @@ libsx.so : $(SHLIBOBJS) rm -f libsx.so - $(CC) -shared -Wl,-z,noexecstack -Wl,-soname,libsx.so.0 $(SHLIBOBJS) -o libsx.so $(XLIBS) + $(CC) $(CPPFLAGS) $(LDFLAGS) -shared -Wl,-z,noexecstack -Wl,-soname,libsx.so.0 $(SHLIBOBJS) -o libsx.so $(XLIBS) draw.o : draw.c libsx.h libsx_private.h Index: libsx-2.05/controlbox/makefile =================================================================== --- libsx-2.05.orig/controlbox/makefile 2013-05-19 03:34:58.000000000 +0100 +++ libsx-2.05/controlbox/makefile 2013-05-19 04:33:33.000000000 +0100 @@ -6,7 +6,7 @@ OBJS = main.o callbacks.o controlbox.o cbox : $(OBJS) - $(CC) -o $@ $(OBJS) $(LIBS) + $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) # main.o depends on main.c (of course) and main.h and callbacks.h Index: libsx-2.05/creq/makefile =================================================================== --- libsx-2.05.orig/creq/makefile 2013-05-19 03:34:58.000000000 +0100 +++ libsx-2.05/creq/makefile 2013-05-19 03:34:58.000000000 +0100 @@ -8,7 +8,7 @@ all : creq creq : $(OBJS) - $(CC) -o $@ $(OBJS) $(LIBS) + $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) main.o : main.c creq.h Index: libsx-2.05/multireq/makefile =================================================================== --- libsx-2.05.orig/multireq/makefile 2013-05-19 03:34:58.000000000 +0100 +++ libsx-2.05/multireq/makefile 2013-05-19 03:34:58.000000000 +0100 @@ -7,7 +7,7 @@ all : multireq multireq : $(OBJS) - $(CC) -g -o $@ $(OBJS) $(LIBS) + $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -g -o $@ $(OBJS) $(LIBS) main.o : main.c multireq.h Index: libsx-2.05/pcurve/makefile =================================================================== --- libsx-2.05.orig/pcurve/makefile 2013-05-19 03:34:58.000000000 +0100 +++ libsx-2.05/pcurve/makefile 2013-05-19 03:34:58.000000000 +0100 @@ -3,7 +3,7 @@ CFLAGS = -g -I../controlbox CLIBS = -lGLU -lGL -lXaw -lXt -lXmu -lX11 -lm -LDFLAGS = $(LIBPATH) $(LIBS) $(CLIBS) +LDFLAGS := $(LIBPATH) $(LIBS) $(CLIBS) $(LDFLAGS) OBJS = fogl.o cfogl.o OTHEROBJS = controlbox.o @@ -11,13 +11,13 @@ default: $(OTHEROBJS) pcurve controlbox.o: ../controlbox/controlbox.c - cc -c $(CFLAGS) ../controlbox/controlbox.c -o controlbox.o + cc -c $(CPPFLAGS) $(CFLAGS) ../controlbox/controlbox.c -o controlbox.o clean: rm -f $(OBJS) cool pcurve: pcurve.c $(OTHEROBJS) - cc $(CFLAGS) pcurve.c -o pcurve $(OTHEROBJS) $(LDFLAGS) + cc $(CFLAGS) $(CPPFLAGS) pcurve.c -o pcurve $(OTHEROBJS) $(LDFLAGS) cool2: cool2.c $(OTHEROBJS) - cc $(CFLAGS) cool2.c $(OTHEROBJS) -o cool2 $(LDFLAGS) + cc $(CFLAGS) $(CPPFLAGS) cool2.c $(OTHEROBJS) -o cool2 $(LDFLAGS) Index: libsx-2.05/skel/makefile =================================================================== --- libsx-2.05.orig/skel/makefile 2013-05-19 03:34:58.000000000 +0100 +++ libsx-2.05/skel/makefile 2013-05-19 03:34:58.000000000 +0100 @@ -6,7 +6,7 @@ OBJS = main.o callbacks.o skel : $(OBJS) - $(CC) -o skel $(OBJS) $(LIBS) + $(CC) $(CFLAGS) $(LFDLAGS) -o skel $(OBJS) $(LIBS) # main.o depends on main.c (of course) and main.h and callbacks.h Index: libsx-2.05/xrootbg/makefile =================================================================== --- libsx-2.05.orig/xrootbg/makefile 2013-05-19 03:34:58.000000000 +0100 +++ libsx-2.05/xrootbg/makefile 2013-05-19 03:34:58.000000000 +0100 @@ -3,7 +3,7 @@ #XAWLIB=Xaw95 XAWLIB=Xaw include ../libsx_defs -CFLAGS = -Wall -O2 -D_POSIX_SOURCE -D$(XAWLIB) +CFLAGS := -Wall -O2 -D_POSIX_SOURCE -D$(XAWLIB) $(CFLAGS) OBJS = xrootbg.o @@ -11,7 +11,7 @@ all : xrootbg xrootbg : $(OBJS) - $(CC) -o $@ $(OBJS) $(LIBS) -lm + $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS) -lm strip xrootbg xrootbg.o : xrootbg.c Index: libsx-2.05/libsx_defs =================================================================== --- libsx-2.05.orig/libsx_defs 2013-05-19 03:34:51.000000000 +0100 +++ libsx-2.05/libsx_defs 2013-05-19 04:32:31.000000000 +0100 @@ -11,6 +11,9 @@ CC = gcc #CC = cc +# Needed for fortify +%.o: %.c + $(CC) $(CPPFLAGS) -c -o $@ $(CFLAGS) $< # Using gcc it's nice to be real strict and compile with -Wall, for # production versions of the library you probably just want -O or -O2