Make all commands that link a program look like

$(CC) $(CFLAGS) $(LDFLAGS) <object files> <extra-libraries> $(LIBS) -o $@

This form seemed to be the most portable, readable, and logical, but in any
case it's better than having a dozen different ones in the tree.

diff --git a/contrib/pg_dumplo/Makefile b/contrib/pg_dumplo/Makefile
index d712b52a890ea0212683e31b6514839835eaf8c5..064a5572b36145930ae642f5bca17ec320ec166e 100644 (file)
--- a/contrib/pg_dumplo/Makefile
+++ b/contrib/pg_dumplo/Makefile
@@ -12,7 +12,7 @@ override CPPFLAGS += -I$(libpq_srcdir)
 all: pg_dumplo
 
 pg_dumplo: $(OBJS) $(libpq_builddir)/libpq.a
-       $(CC) -o $@ $(OBJS) $(libpq) $(CFLAGS) $(LDFLAGS)
+       $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(libpq) $(LIBS) -o $@
 
 install: all installdirs
        $(INSTALL_PROGRAM) pg_dumplo$(X)        $(bindir)

diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index abdefad5e04a4f998f3c75c593e685dca5bb7872..59c3d4d1cfdee330e91880bc8299a3b792cbd674 100644 (file)
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -166,7 +166,7 @@ LIBS = @LIBS@
 LD = @LD@
 with_gnu_ld = @with_gnu_ld@
 ld_R_works = @ld_R_works@
-LDFLAGS = @LDFLAGS@ $(LIBS)
+LDFLAGS = @LDFLAGS@
 LDREL = -r
 LDOUT = -o
 RANLIB = @RANLIB@

diff --git a/src/Makefile.shlib b/src/Makefile.shlib
index 0afebbd6f07717d40c237c737a432a1cd170b149..9f654582832228541f5622223e5a7b2a6f998112 100644 (file)
--- a/src/Makefile.shlib
+++ b/src/Makefile.shlib
@@ -221,7 +221,7 @@ ifeq ($(PORTNAME), beos)
 endif
 
 # Pull in any extra -L options that the user might have specified.
-SHLIB_LINK := $(filter -L%, $(LDFLAGS)) $(SHLIB_LINK)
+SHLIB_LINK := $(filter -L%, $(LIBS)) $(SHLIB_LINK)
 
 ifeq ($(enable_rpath), yes)
 SHLIB_LINK += $(rpath)
@@ -262,7 +262,7 @@ ifneq ($(PORTNAME), aix)
 
 # Normal case
 $(shlib): $(OBJS)
-       $(LINK.shared) -o $@ $(OBJS) $(SHLIB_LINK)
+       $(LINK.shared) $(OBJS) $(SHLIB_LINK) -o $@
 # If we're using major and minor versions, then make a symlink to major-version-only.
 ifneq ($(shlib), lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION))
        rm -f lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)

diff --git a/src/backend/Makefile b/src/backend/Makefile
index 517f3822ef18f6eef2e9e49181c2ce228a5f9079..b7325fd4c818b6deb92c58de5e3d5273761d94a7 100644 (file)
--- a/src/backend/Makefile
+++ b/src/backend/Makefile
@@ -37,7 +37,7 @@ all: postgres $(POSTGRES_IMP)
 ifneq ($(PORTNAME), win)
 
 postgres: $(OBJS)
-       $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(export_dynamic)
+       $(CC) $(CFLAGS) $(LDFLAGS) $(export_dynamic) $^ $(LIBS) -o $@
 
 else # win
 
@@ -80,7 +80,7 @@ $(top_builddir)/src/utils/dllinit.o: $(top_srcdir)/src/utils/dllinit.c
 # 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) $(LDREL) $(LDOUT) $@ $^ $(LDFLAGS)
+       $(CC) $(LDREL) $(LDFLAGS) $^ $(LIBS) -o $@
 
 
 # The following targets are specified in make commands that appear in
@@ -193,7 +193,7 @@ maintainer-clean: distclean
 # are up to date.  It saves the time of doing all the submakes.
 .PHONY: quick
 quick: $(OBJS)
-       $(CC) -o postgres $(OBJS) $(LDFLAGS) $(export_dynamic)
+       $(CC) $(CFLAGS) $(LDFLAGS) $(export_dynamic) $^ $(LIBS) -o postgres
 
 depend dep: $(top_srcdir)/src/include/parser/parse.h $(top_builddir)/src/include/utils/fmgroids.h
        for i in $(DIRS); do $(MAKE) -C $$i $@; done

diff --git a/src/backend/regex/Makefile b/src/backend/regex/Makefile
index 7828c12168747d4f9355036b1d5fda7d3ae0baa6..a334b4f0b88c873e2d71bd844a5581f61324cbc8 100644 (file)
--- a/src/backend/regex/Makefile
+++ b/src/backend/regex/Makefile
@@ -28,7 +28,7 @@ SUBSYS.o: $(OBJS)
        $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
 
 retest: retest.o SUBSYS.o $(DEBUGOBJ)
-       $(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS)
+       $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LIBS) -o $@
 
 depend dep:
        $(CC) -MM $(CFLAGS) *.c >depend

diff --git a/src/backend/utils/mb/Makefile b/src/backend/utils/mb/Makefile
index 9b23163a871402c5ecde4f9696027a2c2a8e002d..dc26722a50dfba906ceded7b2f57b9b2cf13a63b 100644 (file)
--- a/src/backend/utils/mb/Makefile
+++ b/src/backend/utils/mb/Makefile
@@ -22,13 +22,13 @@ SUBSYS.o: $(OBJS)
 utftest.o: utftest.c conv.c wchar.c mbutils.c
 
 sjistest: sjistest.o palloc.o common.o mbutils.o wchar.o wstrcmp.o wstrncmp.o big5.o
-       $(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS)
+       $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LIBS) -o $@
 
 liketest: liketest.o palloc.o $(OBJS)
-       $(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS)
+       $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LIBS) -o $@
 
 utftest: utftest.o palloc.o common.o wstrcmp.o wstrncmp.o big5.o
-       $(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS)
+       $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LIBS) -o $@
 
 depend dep:
        $(CC) -MM $(CFLAGS) *.c >depend

diff --git a/src/bin/pg_dump/Makefile b/src/bin/pg_dump/Makefile
index fdb779d285e8f60fc5c163582f0fbd19d5bfb32b..1a348d39a8c41331ff1a8ce4ff0482ff1bd60081 100644 (file)
--- a/src/bin/pg_dump/Makefile
+++ b/src/bin/pg_dump/Makefile
@@ -20,10 +20,10 @@ override CPPFLAGS+= -I$(libpq_srcdir)
 all: submake pg_dump pg_restore pg_dumpall
 
 pg_dump: pg_dump.o common.o $(OBJS) $(libpq_builddir)/libpq.a 
-       $(CC) $(CFLAGS) -o $@ pg_dump.o common.o $(OBJS) $(libpq) $(LDFLAGS)
+       $(CC) $(CFLAGS) $(LDFLAGS) pg_dump.o common.o $(OBJS) $(libpq) $(LIBS) -o $@
 
 pg_restore: pg_restore.o $(OBJS) $(libpq_builddir)/libpq.a
-       $(CC) $(CFLAGS) -o $@ pg_restore.o $(OBJS) $(libpq) $(LDFLAGS)
+       $(CC) $(CFLAGS) $(LDFLAGS) pg_restore.o $(OBJS) $(libpq) $(LIBS) -o $@
 
 ../../utils/strdup.o:
        $(MAKE) -C ../../utils strdup.o

diff --git a/src/bin/pg_encoding/Makefile b/src/bin/pg_encoding/Makefile
index a63dfc843d996f04a35dc3f1a924003a21b56368..f280b7c56a57f32b187319c834b5697c4a210c36 100644 (file)
--- a/src/bin/pg_encoding/Makefile
+++ b/src/bin/pg_encoding/Makefile
@@ -14,10 +14,10 @@ include $(top_builddir)/src/Makefile.global
 
 OBJS= pg_encoding.o
 
-all: submake pg_encoding$(X)
+all: submake pg_encoding
 
-pg_encoding$(X): $(OBJS)
-       $(CC) -o $@ $(OBJS) $(libpq) $(LDFLAGS) $(CFLAGS)
+pg_encoding: $(OBJS)
+       $(CC) $(CFLAGS) $(LDFLAGS) $^ $(libpq) $(LIBS) -o $@
 
 .PHONY: submake
 

diff --git a/src/bin/pg_id/Makefile b/src/bin/pg_id/Makefile
index 68b2ab5826890c2490edf4e0341659e6aa20d234..cc8cc4789bdc6c5d84eaed32524b9f652d07c898 100644 (file)
--- a/src/bin/pg_id/Makefile
+++ b/src/bin/pg_id/Makefile
@@ -12,10 +12,10 @@ subdir = src/bin/pg_id
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-all: pg_id$(X)
+all: pg_id
 
-pg_id$(X): pg_id.o
-       $(CC) -o $@ $^ $(LDFLAGS)
+pg_id: pg_id.o
+       $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LIBS) -o $@
 
 install: all installdirs
        $(INSTALL_PROGRAM) pg_id$(X) $(DESTDIR)$(bindir)/pg_id$(X)

diff --git a/src/bin/pg_passwd/Makefile b/src/bin/pg_passwd/Makefile
index 6f083c24981f45b571cb1cb63f325b5fcd49ba52..93d7f557be0bb64fe477c242dbf30048c67efd75 100644 (file)
--- a/src/bin/pg_passwd/Makefile
+++ b/src/bin/pg_passwd/Makefile
@@ -6,6 +6,9 @@ include $(top_builddir)/src/Makefile.global
 
 all: pg_passwd
 
+pg_passwd: pg_passwd.o
+       $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LIBS) -o $@
+
 install: all installdirs
        $(INSTALL_PROGRAM) pg_passwd$(X) $(DESTDIR)$(bindir)/pg_passwd$(X)
 

diff --git a/src/bin/pgtclsh/Makefile b/src/bin/pgtclsh/Makefile
index b25246a4e91e86d9c065941b98828aaafc2628d9..9776b750c6c234a1d47b900442b27fbd4e2f1c82 100644 (file)
--- a/src/bin/pgtclsh/Makefile
+++ b/src/bin/pgtclsh/Makefile
@@ -39,10 +39,10 @@ endif
 all: submake $(PROGRAMS)
 
 pgtclsh: pgtclAppInit.o
-       $(CC) $(CFLAGS) -o $@ $< $(libpgtcl) $(libpq) $(TCL_LIB_SPEC) $(TCL_LIBS) $(LDFLAGS)
+       $(CC) $(CFLAGS) $(LDFLAGS) $^ $(libpgtcl) $(libpq) $(TCL_LIB_SPEC) $(TCL_LIBS) $(LIBS) -o $@
 
 pgtksh: pgtkAppInit.o
-       $(CC) $(CFLAGS) -o $@ $< $(libpgtcl) $(libpq) $(TK_LIB_SPEC) $(TK_LIBS) $(TCL_LIB_SPEC) $(LDFLAGS)
+       $(CC) $(CFLAGS) $(LDFLAGS) $^ $(libpgtcl) $(libpq) $(TK_LIB_SPEC) $(TK_LIBS) $(TCL_LIB_SPEC) $(LIBS) -o $@
 
 .PHONY: submake
 submake:

diff --git a/src/bin/psql/Makefile b/src/bin/psql/Makefile
index 3e97b8d7469b3af27f297347c51b71b3180d336f..9acb30423c0b57218062197b5294cb40b75bb05a 100644 (file)
--- a/src/bin/psql/Makefile
+++ b/src/bin/psql/Makefile
@@ -20,7 +20,7 @@ OBJS=command.o common.o help.o input.o stringutils.o mainloop.o \
        copy.o startup.o prompt.o variables.o large_obj.o print.o describe.o \
        tab-complete.o
 
-all: submake psql$(X)
+all: submake psql
 
 ifdef STRDUP
 OBJS+=$(top_builddir)/src/utils/strdup.o
@@ -47,8 +47,8 @@ endif
 
 # End of hacks for picking up backend 'port' modules
 
-psql$(X): $(OBJS) $(libpq_builddir)/libpq.a
-       $(CC) $(CFLAGS) -o $@ $(OBJS) $(libpq) $(LDFLAGS)
+psql: $(OBJS) $(libpq_builddir)/libpq.a
+       $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(libpq) $(LIBS) -o $@
 
 help.o: $(srcdir)/sql_help.h
 

diff --git a/src/interfaces/ecpg/preproc/Makefile b/src/interfaces/ecpg/preproc/Makefile
index 1948eb9208f3245fd12a7e839cb264bf67b72c08..ad908f121f423a8711a3fb804ba929485b073976 100644 (file)
--- a/src/interfaces/ecpg/preproc/Makefile
+++ b/src/interfaces/ecpg/preproc/Makefile
@@ -1,3 +1,5 @@
+# $Header$
+
 subdir = src/interfaces/ecpg/preproc
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
@@ -9,7 +11,6 @@ PATCHLEVEL=0
 override CPPFLAGS+=-I$(srcdir)/../include -DMAJOR_VERSION=$(MAJOR_VERSION) \
        -DMINOR_VERSION=$(MINOR_VERSION) -DPATCHLEVEL=$(PATCHLEVEL) \
        -DINCLUDE_PATH=\"$(includedir)\" 
-# -DYYDEBUG -g
 
 OBJS=preproc.o pgc.o type.o ecpg.o ecpg_keywords.o output.o\
     keywords.o c_keywords.o ../lib/typename.o descriptor.o variable.o
@@ -25,7 +26,7 @@ endif
 
 
 ecpg: $(OBJS)
-       $(CC) -o $@ $^ $(LDFLAGS)
+       $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LIBS) -o $@
 
 $(srcdir)/preproc.c $(srcdir)/preproc.h: preproc.y
        $(YACC) -d $(YFLAGS) $<

diff --git a/src/makefiles/Makefile.aix b/src/makefiles/Makefile.aix
index d3ee2fab357b9f3910f59b43c9135dff4cf745a4..c33c7a546c0ffd85371c5540d441b3f6b9791c78 100644 (file)
--- a/src/makefiles/Makefile.aix
+++ b/src/makefiles/Makefile.aix
@@ -35,11 +35,11 @@ else
        $(MKLDEXPORT) postgres . > $@
   endif
 endif
-       $(CC) -Wl,-bE:$(top_builddir)/src/backend/$@ -o postgres $(OBJS) $(LDFLAGS)
+       $(CC) -Wl,-bE:$(top_builddir)/src/backend/$@ -o postgres $(OBJS) $(LDFLAGS) $(LIBS)
 
 %$(EXPSUFF): %.o
        $(MKLDEXPORT) $*.o > $*$(EXPSUFF)
 
 %$(DLSUFFIX): %.o %$(EXPSUFF)
        @echo Making shared library $@ from $*.o, $*$(EXPSUFF) and postgres.imp
-       $(CC) -Wl,-H512 -Wl,-bM:SRE -Wl,-bI:$(top_builddir)/src/backend/$(POSTGRES_IMP) -Wl,-bE:$*$(EXPSUFF) -o $@ $*.o $(LDFLAGS) $(LDFLAGS_SL)
+       $(CC) -Wl,-H512 -Wl,-bM:SRE -Wl,-bI:$(top_builddir)/src/backend/$(POSTGRES_IMP) -Wl,-bE:$*$(EXPSUFF) -o $@ $*.o $(LDFLAGS) $(LIBS) $(LDFLAGS_SL)

diff --git a/src/makefiles/Makefile.qnx4 b/src/makefiles/Makefile.qnx4
index 2cf15be5f5f7ef8714076243aeab7f57da96c245..5a74d84c7cce8f109b69d12f930db23c4cc8a4f0 100644 (file)
--- a/src/makefiles/Makefile.qnx4
+++ b/src/makefiles/Makefile.qnx4
@@ -1,12 +1,11 @@
 MK_NO_LORDER= true
-CXXFLAGS+= -I/usr/local/lib/gcc-lib/i386-pc-qnx4/egcs-2.91.60/include/g++
 AR= ar
 AROPT = cr
 LD= $(AR)
 LDREL= $(AROPT)
 LDOUT=
 LIBS= -lunix
-LDFLAGS=   $(LIBS)
+LDFLAGS=
 
 enable_shared = no
 DLSUFFIX = .so

diff --git a/src/makefiles/Makefile.svr4 b/src/makefiles/Makefile.svr4
index dd1fdec4fa9a1d8adfcd9c6c4b44f9be632fab0f..9704f1a1d647550c5cdeb3b4d71beb873f8b41ea 100644 (file)
--- a/src/makefiles/Makefile.svr4
+++ b/src/makefiles/Makefile.svr4
@@ -2,7 +2,8 @@
 # symbol names to tell them what to export/import.
 #MAKE_EXPORTS= true
 
-LDFLAGS+= -lc /usr/ucblib/libucb.a -LD-Blargedynsym
+LIBS += -lc /usr/ucblib/libucb.a
+LDFLAGS += -LD-Blargedynsym
 
 DLSUFFIX = .so
 CFLAGS_SL =