This commit represents a clean compile with the new templates under

FreeBSD

The Makefile(s) have all been cleaned up such that there is a single
LDFLAGS vs LD_ADD or LDADD or LDFLAGS or LDFLAGS_BE.  The Makefile(s)
should be alot more straightforward then they were before...and
consistent

src/Makefile.global.in

@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.17 1997/04/04 07:57:45 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.18 1997/04/04 10:38:23 scrappy Exp $
 #
 # NOTES
 #    Essentially all Postgres make files include this file and use the 
@@ -249,12 +249,9 @@ endif
 CC= @CC@
 LEX= @LEX@
 AROPT= @AROPT@
-CFLAGS= @CPPFLAGS@ @ALL@
+CFLAGS= @CPPFLAGS@ @CFLAGS@
-CFLAGS_SL= @SHARED_LIBS@
+CFLAGS_SL= @SHARED_LIB@
-CFLAGS_BE= @BACKEND@
+LDFLAGS= @LDFLAGS@ @LIBS@
-LDFLAGS= @LDFLAGS@
-LDADD_BE= @LIBS@
-LD_ADD= $(LDADD_BE)
 DLSUFFIX= @DLSUFFIX@
 
 #----------------------------------------------------------------------
@@ -360,7 +357,7 @@ ifeq ($(PORTNAME), irix5)
 RANLIB= touch
 
 %.so: %.o
-	$(LD) -G -Bdynamic -o $@ $< $(LD_ADD)
+	$(LD) -G -Bdynamic -o $@ $< $(LDFLAGS)
 
 endif
 
@@ -368,7 +365,7 @@ endif
 
 ifeq ($(PORTNAME), linux)
 ifdef LINUX_ELF
-LDFLAGS_BE= -rdynamic
+LDFLAGS+= -rdynamic
 endif
 MK_NO_LORDER= true
 
@@ -402,8 +399,7 @@ YACC= bison -y
 # symbol names to tell them what to export/import.
 MAKE_EXPORTS= true
 
-LDADD_BE+= /usr/ucblib/libucb.a 
+LDFLAGS+= /usr/ucblib/libucb.a -LD-Blargedynsym
-LDFLAGS_BE= -LD-Blargedynsym
 
 %.so: %.o
 	$(LD) -G -Bdynamic -o $@ $<
@@ -426,12 +422,6 @@ endif
 ifeq ($(PORTNAME), univel)
 YACC= bison -y
 
-#
-#	Some of the Makefiles use LDADD, others use LD_ADD.
-#	This makes them the same.
-#
-LDADD= $(LD_ADD)
-
 # MAKE_EXPORTS is required for svr4 loaders that want a file of
 # symbol names to tell them what to export/import.
 #MAKE_EXPORTS= true
@@ -483,32 +473,14 @@ endif
 
 ifneq ($(CUSTOM_COPT),)
   COPT= $(CUSTOM_COPT)
-else
-  ifeq ($(CC), gcc)
-    COPT= -O2 -Werror
-  else
-    COPT= -O
-  endif
 endif
 
-
 ifeq ($(CC), gcc)
-# Some flags only gcc recognizes...
-# PostgreSQL should *always* compile with these enabled
 CFLAGS+= -Wall -Wmissing-prototypes
 endif
 
-# Globally pass debugging/optimization/profiling flags based
-# on the options selected above.
-
-
 ifdef COPT
    CFLAGS+= $(COPT)
-else
-   ifndef CFLAGS_OPT
-      CFLAGS_OPT= -O
-   endif
-   CFLAGS+= $(CFLAGS_OPT)
 endif
 
 ifndef CASSERT
@@ -517,13 +489,7 @@ endif
 
 ifdef PROFILE
    CFLAGS+= $(PROFILE)
-   LDFLAGS+= $(PROFILE)
 endif
 
 # Globally pass PORTNAME
 CFLAGS+= -D$(PORTNAME)
-
-# include port-specific flags
-CFLAGS+= $(CFLAGS_BE)
-LDFLAGS+= $(LDFLAGS_BE)
-

src/backend/Makefile

@@ -34,7 +34,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.22 1997/04/02 00:34:23 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.23 1997/04/04 10:38:49 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -60,7 +60,7 @@ endif
 all: postgres $(EXP) global1.bki.source local1_template1.bki.source
 
 postgres: $(OBJS) ../utils/version.o
-	$(CC) -o postgres $(LDFLAGS) $(OBJS) ../utils/version.o $(LD_ADD) 
+	$(CC) -o postgres $(OBJS) ../utils/version.o $(LDFLAGS)
 
 $(OBJS): $(DIRS:%=%.dir)
 
@@ -79,7 +79,7 @@ catalog/global1.bki.source catalog/local1_template1.bki.source:
 # The postgres.o target is needed by the rule in Makefile.global that
 # creates the exports file when MAKE_EXPORTS = true.
 postgres.o: $(OBJS)
-	$(CC) $(LDFLAGS) -r -o postgres.o $(OBJS) $(LD_ADD)
+	$(CC) -r -o postgres.o $(OBJS) $(LDFLAGS)
 
 
 ############################################################################
@@ -150,7 +150,7 @@ $(BINDIR) $(LIBDIR) $(HEADERDIR):
 # are up to date.  It saves the time of doing all the submakes.
 .PHONY: quick
 quick: $(OBJS)
-	$(CC) $(LDFLAGS) -o postgres $(OBJS) $(LD_ADD)
+	$(CC) -o postgres $(OBJS) $(LDFLAGS)
 
 #
 # Build the file, "./ID", used by the "gid" (grep-for-identifier) tool

src/backend/bootstrap/Makefile

@@ -4,7 +4,7 @@
 #    Makefile for the bootstrap module
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.5 1997/04/02 18:10:46 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.6 1997/04/04 10:38:58 scrappy Exp $
 #
 #
 # We must build bootparse.c and bootscanner.c with yacc and lex and sed,
@@ -25,7 +25,7 @@ INCLUDE_OPT= -I.. \
              -I../port/$(PORTNAME) \
              -I../../include
 
-CFLAGS+= $(INCLUDE_OPT) 
+CFLAGS+= $(INCLUDE_OPT)  -Wno-error
 
 BOOTYACCS= bootstrap_tokens.h bootparse.c
 

src/backend/libpq/Makefile

@@ -4,7 +4,7 @@
 #    Makefile for libpq subsystem (backend half of libpq interface)
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/libpq/Makefile,v 1.6 1997/03/18 20:14:32 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/libpq/Makefile,v 1.7 1997/04/04 10:39:19 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -20,7 +20,7 @@ CFLAGS+=$(INCLUDE_OPT)
 # kerberos flags
 ifdef KRBVERS
 CFLAGS+= $(KRBFLAGS)
-LDADD+= $(KRBLIBS)
+LDFLAGS+= $(KRBLIBS)
 endif
 
 OBJS = be-dumpdata.o be-fsstubs.o be-pqexec.o pqcomprim.o\

src/backend/optimizer/geqo/Makefile

@@ -5,7 +5,7 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $Id: Makefile,v 1.4 1997/04/02 18:11:49 scrappy Exp $
+# $Id: Makefile,v 1.5 1997/04/04 10:39:50 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -16,7 +16,7 @@ INCLUDE_OPT = -I../.. \
               -I../../port/$(PORTNAME) \
               -I../../../include
 
-CFLAGS+=$(INCLUDE_OPT) 
+CFLAGS+=$(INCLUDE_OPT)  -Wno-error
 
 OBJS =	geqo_copy.o geqo_eval.o geqo_main.o geqo_misc.o \
 	geqo_params.o geqo_paths.o geqo_pool.o geqo_recombination.o \

src/backend/parser/Makefile

@@ -4,7 +4,7 @@
 #    Makefile for parser
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/parser/Makefile,v 1.5 1997/04/02 18:12:14 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/parser/Makefile,v 1.6 1997/04/04 10:40:11 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -15,7 +15,7 @@ INCLUDE_OPT= -I.. \
              -I../port/$(PORTNAME) \
              -I../../include
 
-CFLAGS+= $(INCLUDE_OPT)
+CFLAGS+= $(INCLUDE_OPT) -Wno-error
 
 OBJS= analyze.o catalog_utils.o dbcommands.o gram.o \
       keywords.o parser.o parse_query.o scan.o scansup.o sysfunc.o

src/backend/tcop/Makefile

@@ -4,7 +4,7 @@
 #    Makefile for tcop
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/tcop/Makefile,v 1.10 1997/04/02 18:13:01 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/tcop/Makefile,v 1.11 1997/04/04 10:40:34 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -15,7 +15,7 @@ INCLUDE_OPT= -I.. \
              -I../port/$(PORTNAME) \
              -I../../include
 
-CFLAGS+= $(INCLUDE_OPT)
+CFLAGS+= $(INCLUDE_OPT) -Wno-error
 
 OBJS= aclchk.o dest.o fastpath.o postgres.o pquery.o utility.o variable.o
 

src/bin/Makefile.global

@@ -7,20 +7,17 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/Attic/Makefile.global,v 1.13 1997/01/15 05:58:47 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/bin/Attic/Makefile.global,v 1.14 1997/04/04 10:40:56 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
 LIBPQDIR:= $(SRCDIR)/libpq
 
-#LD_ADD+= -L$(SRCDIR)/libpq -lpq
-#DPADD+= -L$(SRCDIR)/libpq -lpq
-
 #
 # And where libpq goes, so goes the authentication stuff...
 #
 ifdef KRBVERS
-LD_ADD+= $(KRBLIBS)
+LDFLAGS+= $(KRBLIBS)
 CFLAGS+= $(KRBFLAGS)
 endif
 

src/bin/pg_dump/Makefile.in

@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/Makefile.in,v 1.1 1997/02/09 03:23:23 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/Makefile.in,v 1.2 1997/04/04 10:41:17 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -20,7 +20,7 @@ OBJS= pg_dump.o common.o @STRDUP@
 all: submake pg_dump
 
 pg_dump: $(OBJS) $(LIBPQDIR)/libpq.a
-	$(CC) $(LDFLAGS) -o pg_dump -L$(LIBPQDIR) $(OBJS) -lpq $(LD_ADD)
+	$(CC) -o pg_dump -L$(LIBPQDIR) $(OBJS) -lpq $(LDFLAGS)
 
 ../../utils/strdup.o:
 	$(MAKE) -C ../../utils strdup.o

src/bin/pg_id/Makefile

@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/pg_id/Attic/Makefile,v 1.4 1997/02/06 02:31:25 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/pg_id/Attic/Makefile,v 1.5 1997/04/04 10:41:26 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -20,7 +20,7 @@ OBJS= pg_id.o
 all: pg_id
 
 pg_id: $(OBJS) $(LIBPQDIR)/libpq.a
-	$(CC) $(LDFLAGS) -o pg_id -L$(LIBPQDIR) $(OBJS) -lpq $(LD_ADD)
+	$(CC) -o pg_id -L$(LIBPQDIR) $(OBJS) -lpq $(LDFLAGS)
 
 $(LIBPQDIR)/libpq.a:
 	$(MAKE) -C $(LIBPQDIR) libpq.a

src/bin/pg_version/Makefile

@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/pg_version/Attic/Makefile,v 1.3 1997/02/06 02:31:52 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/pg_version/Attic/Makefile,v 1.4 1997/04/04 10:41:37 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -20,7 +20,7 @@ OBJS= pg_version.o ../../utils/version.o
 all: pg_version
 
 pg_version: submake $(OBJS)
-	$(CC) $(LDFLAGS) -o pg_version $(OBJS) $(LD_ADD)
+	$(CC) -o pg_version $(OBJS) $(LDFLAGS)
 
 .PHONY: submake
 submake:

src/bin/pgtclsh/Makefile

@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.5 1997/01/21 05:16:38 bryanh Exp $
+#    $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.6 1997/04/04 10:42:11 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -25,12 +25,12 @@ all: pgtclsh pgtksh
 
 pgtclsh: pgtclAppInit.o
 	$(CC) $(CFLAGS) -o $@ pgtclAppInit.o \
-	  $(LIBPGTCL) $(LIBPQ) -L$(TCL_LIBDIR) $(TCL_LIB) -lm $(LD_ADD)
+	  $(LIBPGTCL) $(LIBPQ) -L$(TCL_LIBDIR) $(TCL_LIB) -lm $(LDFLAGS)
 
 pgtksh: pgtkAppInit.o
 	$(CC) $(CFLAGS) -o $@ pgtkAppInit.o \
 	  $(LIBPGTCL) $(LIBPQ) -L$(TCL_LIBDIR) -L$(TK_LIBDIR) -L$(X11_LIBDIR) \
-	  $(TK_LIB) $(TCL_LIB) -lX11 -lm $(LD_ADD)
+	  $(TK_LIB) $(TCL_LIB) -lX11 -lm $(LDFLAGS)
 
 install: pgtclsh pgtksh
 	$(INSTALL) $(INSTL_EXE_OPTS) pgtclsh $(DESTDIR)$(BINDIR)/pgtclsh

src/bin/psql/Makefile.in

@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/psql/Attic/Makefile.in,v 1.3 1997/02/09 03:23:52 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/bin/psql/Attic/Makefile.in,v 1.4 1997/04/04 10:42:23 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -24,7 +24,7 @@ OBJS= psql.o stringutils.o @STRDUP@
 all: submake psql
 
 psql: $(OBJS) $(LIBPQDIR)/libpq.a
-	$(CC) $(LDFLAGS) -o psql -L$(LIBPQDIR) $(OBJS) -lpq $(LD_ADD)
+	$(CC) -o psql -L$(LIBPQDIR) $(OBJS) -lpq $(LDFLAGS)
 
 ../../utils/strdup.o:
 	$(MAKE) -C ../../utils strdup.o

src/build

@@ -28,12 +28,13 @@ else
 		TEMPLATE=template/$a
 	fi
 	AROPT=`grep AROPT $TEMPLATE | awk -F: '{print $2}'`
-	SHARED_LIBS=`grep SHARED_LIBS $TEMPLATE | awk -F: '{print $2}'`
+	SHARED_LIB=`grep SHARED_LIB $TEMPLATE | awk -F: '{print $2}'`
-	ALL=`grep ALL $TEMPLATE | awk -F: '{print $2}'`
+	CFLAGS=`grep CFLAGS $TEMPLATE | awk -F: '{print $2}'`
-	BACKEND=`grep BACKEND $TEMPLATE | awk -F: '{print $2}'`
 	SRCH_INC=`grep SRCH_INC $TEMPLATE | awk -F: '{print $2}'`
 	SRCH_LIB=`grep SRCH_LIB $TEMPLATE | awk -F: '{print $2}'`
 	USE_LOCALE=`grep USE_LOCALE $TEMPLATE | awk -F: '{print $2}'`
+	DLSUFFIX=`grep DLSUFFIX $TEMPLATE | awk -F: '{print $2}'`
+	DL_LIB=`grep DL_LIB $TEMPLATE | awk -F: '{print $2}'`
 fi
 
 $ECHO_N "Additional directories to search for .h files [$SRCH_INC]: $ECHO_C"
@@ -45,14 +46,13 @@ else
 	if [ "$a." != "." ]; then
 		SRCH_INC = $a
 	fi
-	echo $a
         CPPFLAGS=`echo "$SRCH_INC" | sed 's@  *@ @g; s@^\([^ ]\)@-I\1@; s@ \([^ ]\)@ -I\1@g'`
 fi
 
-echo ""
+
 $ECHO_N "Additional directories to search for library files [$SRCH_LIB]: $ECHO_C"
 read a
-if [ "$a." != " ." ]
+if [ "$a." = " ." ]
 then
 	LDFLAGS=
 else
@@ -105,8 +105,8 @@ then
         NOHBA=${a}
 fi
 
-export BUILDRUN USE_LOCALE DEF_PGPORT NOHBA AROPT 
+export BUILDRUN USE_LOCALE DEF_PGPORT NOHBA AROPT DLSUFFIX DL_LIB
-export SHARED_LIBS CFLAGS CPPFLAGS LDFLAGS
+export SHARED_LIB CFLAGS CPPFLAGS LDFLAGS
 
 ./configure --prefix=${IDIR}
 

src/configure.in

@@ -55,9 +55,10 @@ AC_SUBST(TR)
 AC_SUBST(LDFLAGS)
 AC_SUBST(CPPFLAGS)
 AC_SUBST(AROPT)
-AC_SUBST(SHARED_LIBS)
+AC_SUBST(SHARED_LIB)
-AC_SUBST(ALL)
+AC_SUBST(CFLAGS)
-AC_SUBST(BACKEND)
+AC_SUBST(DLSUFFIX)
+AC_SUBST(DL_LIB)
 
 
 

src/interfaces/libpq++/Makefile

@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile,v 1.7 1997/03/25 09:20:32 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile,v 1.8 1997/04/04 10:42:43 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -46,7 +46,7 @@ ifeq ($(PORTNAME), i386_solaris)
   INSTALL-SHLIB-DEP := install-shlib
   SHLIB := libpq++.so.1
   LDFLAGS_SL = -G -z text
-  CFLAGS += -fPIC
+  CFLAGS += $(CFLAGS_SL)
 endif
 
 all: $(LIBNAME).a $(SHLIB) install examples

src/interfaces/libpq++/examples/Makefile

@@ -21,13 +21,13 @@ INCLUDE_OPT= \
              -I$(HEADERDIR)
 CXXFLAGS+= $(INCLUDE_OPT)
 
-LD_ADD+= -L.. -lpq++ -L$(LIBPQDIR) -lpq 
+LDFLAGS+= -L.. -lpq++ -L$(LIBPQDIR) -lpq 
 
 #
 # And where libpq goes, so goes the authentication stuff...
 #
 ifdef KRBVERS
-LD_ADD+= $(KRBLIBS)
+LDFLAGS+= $(KRBLIBS)
 CXXFLAGS+= $(KRBFLAGS)
 endif
 
@@ -37,7 +37,7 @@ PROGS=	testlibpq0 testlibpq1 testlibpq2 testlibpq3 \
 all: submake $(PROGS)
 
 $(PROGS): % : %.cc ../$(LIBNAME).a
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $@.cc $(LD_ADD)
+	$(CXX) $(CXXFLAGS) -o $@ $@.cc $(LDFLAGS)
 
 .PHONY: submake
 submake: 

src/interfaces/libpq/Makefile

@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.34 1997/04/04 02:53:14 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.35 1997/04/04 10:42:34 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -40,13 +40,13 @@ ifeq ($(PORTNAME), BSD44_derived)
   install-shlib-dep := install-shlib
   shlib := libpq.so.1.0
   LDFLAGS_SL = -x -Bshareable -Bforcearchive
-  CFLAGS += -fpic -DPIC
+  CFLAGS += $(CFLAGS_SL)
 endif
 ifeq ($(PORTNAME), i386_solaris)
   install-shlib-dep := install-shlib
   shlib := libpq.so.1
   LDFLAGS_SL = -G -z text
-  CFLAGS += -fPIC
+  CFLAGS += $(CFLAGS_SL)
 endif
 
 all: libpq.a $(shlib) c.h
@@ -76,7 +76,7 @@ pqcomprim.c:	    ../backend/libpq/pqcomprim.c
 	$(MAKE) -C ../backend fmgr.h
 
 $(shlib): $(OBJS)
-	$(LD) $(LDFLAGS) $(LDFLAGS_SL) -o $@ $(OBJS)
+	$(LD) $(LDFLAGS_SL) -o $@ $(OBJS) 
 	ln -sf $@ libpq.so
 
 

src/template/freebsd

@@ -1,7 +1,6 @@
-AROPT:crs
+AROPT:cq
-BACKEND:
 SHARED_LIB:-fpic -DPIC
-ALL:-O2 -m486 -pipe
+CFLAGS:-O2 -m486 -pipe
 SRCH_INC:/usr/local/include
 SRCH_LIB:/usr/local/lib
 USE_LOCALE:no

src/test/examples/Makefile

@@ -7,13 +7,13 @@ include ../../Makefile.global
 
 CFLAGS+= -I$(LIBPQDIR)
 
-LD_ADD+= -L$(LIBPQDIR) -lpq 
+LDFLAGS+= -L$(LIBPQDIR) -lpq 
 
 #
 # And where libpq goes, so goes the authentication stuff...
 #
 ifdef KRBVERS
-LD_ADD+= $(KRBLIBS)
+LDFLAGS+= $(KRBLIBS)
 CFLAGS+= $(KRBFLAGS)
 endif
 
@@ -22,7 +22,7 @@ PROGS= testlibpq0 testlibpq1 testlibpq2 testlibpq3 testlibpq4 testlo
 all: $(PROGS)
 
 $(PROGS): % : %.c 
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $@.c $(LD_ADD)
+	$(CC) $(CFLAGS) -o $@ $@.c $(LDFLAGS)
 
 clean: 
 	rm -f $(PROGS)