diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2001-02-20 19:20:30 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2001-02-20 19:20:30 +0000 |
| commit | cb6edf9d56019a1a3d9fd3df0dfe4a3ca1e7daab (patch) | |
| tree | fa108600dcddc1d1c70ae452dcb7111bae91f3df /src/Makefile.shlib | |
| parent | c4a9023d520d8b9dee8bed396d08a0bf801726e2 (diff) | |
| download | postgresql-cb6edf9d56019a1a3d9fd3df0dfe4a3ca1e7daab.tar.gz | |
Make sure -L and -I's for our source tree are always before system include
or library directories on the command line.
Diffstat (limited to 'src/Makefile.shlib')
| -rw-r--r-- | src/Makefile.shlib | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/Makefile.shlib b/src/Makefile.shlib index b61910894f..461eb8d697 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.44 2001/02/10 18:46:34 momjian Exp $ +# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.45 2001/02/20 19:20:28 petere Exp $ # #------------------------------------------------------------------------- @@ -230,9 +230,6 @@ ifeq ($(PORTNAME), beos) SHLIB_LINK += -ltermcap -lstdc++.r4 -lbind -lsocket -L/boot/develop/lib/x86 endif -# Pull in any extra -L options that the user might have specified. -SHLIB_LINK := $(filter -L%, $(LDFLAGS)) $(SHLIB_LINK) - ifeq ($(enable_rpath), yes) SHLIB_LINK += $(rpath) endif @@ -298,7 +295,7 @@ else # PORTNAME == win # WIN case $(shlib) lib$(NAME).a: $(OBJS) $(top_builddir)/src/utils/dllinit.o $(DLLTOOL) --export-all --output-def $(NAME).def $(OBJS) - $(DLLWRAP) -o $(shlib) --dllname $(shlib) --def $(NAME).def $(OBJS) $(top_builddir)/src/utils/dllinit.o $(DLLINIT) $(SHLIB_LINK) + $(DLLWRAP) -o $(shlib) --dllname $(shlib) --def $(NAME).def $(OBJS) $(top_builddir)/src/utils/dllinit.o $(DLLINIT) $(DLLLIBS) $(SHLIB_LINK) $(DLLTOOL) --dllname $(shlib) --def $(NAME).def --output-lib lib$(NAME).a $(top_builddir)/src/utils/dllinit.o: $(top_srcdir)/src/utils/dllinit.c |