diff options
| author | Peter Eisentraut | 2000-11-30 20:36:13 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2000-11-30 20:36:13 +0000 |
| commit | e5ba2fc5b59ee5a7993b3ab65a32860661da81b8 (patch) | |
| tree | 7ea763b2dc21ff00fae9edc654890d5e1159cbad /src/Makefile.shlib | |
| parent | 309112267f0f73ee79e36a3efe1060b34b5c7b46 (diff) | |
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.
Diffstat (limited to 'src/Makefile.shlib')
| -rw-r--r-- | src/Makefile.shlib | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Makefile.shlib b/src/Makefile.shlib index 6c543f61fea..a5decfaa496 100644 --- a/src/Makefile.shlib +++ b/src/Makefile.shlib @@ -6,7 +6,7 @@ # Copyright (c) 1998, Regents of the University of California # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.35 2000/11/14 21:11:59 petere Exp $ +# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.36 2000/11/30 20:36:10 petere Exp $ # #------------------------------------------------------------------------- @@ -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) |