diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2000-08-31 16:12:35 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2000-08-31 16:12:35 +0000 |
| commit | 424f0edcb8d73446223f1812d3ca88150e1cc953 (patch) | |
| tree | 6b0f0a9d1d9aed67873e9ff8acd2b5a6da77ac58 /src/makefiles | |
| parent | d4266620e1c92d0b5d76d8c583f2fbfcf5bcd7fe (diff) | |
| download | postgresql-424f0edcb8d73446223f1812d3ca88150e1cc953.tar.gz | |
Fix relative path references so that make knowns which dependencies refer
to one another. Sort out builddir vs srcdir variable namings. Remove some
now obsoleted make variables.
Diffstat (limited to 'src/makefiles')
| -rw-r--r-- | src/makefiles/Makefile.aix | 8 | ||||
| -rw-r--r-- | src/makefiles/Makefile.hpux | 4 | ||||
| -rw-r--r-- | src/makefiles/Makefile.win | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/makefiles/Makefile.aix b/src/makefiles/Makefile.aix index ba6d0540d3..0066135179 100644 --- a/src/makefiles/Makefile.aix +++ b/src/makefiles/Makefile.aix @@ -10,16 +10,16 @@ IMPSUFF= .imp POSTGRES_IMP= postgres$(IMPSUFF) -MKLDEXPORT=$(SRCDIR)/backend/port/aix/mkldexport.sh +MKLDEXPORT=$(top_srcdir)/src/backend/port/aix/mkldexport.sh $(POSTGRES_IMP): @echo Making $@ - $(MKLDEXPORT) postgres $(BINDIR) > $@ - $(CC) -Wl,-bE:$(SRCDIR)/backend/$@ -o postgres $(OBJS) $(LDFLAGS) + $(MKLDEXPORT) postgres $(bindir) > $@ + $(CC) -Wl,-bE:$(top_builddir)/src/backend/$@ -o postgres $(OBJS) $(LDFLAGS) %$(EXPSUFF): $(MKLDEXPORT) $*.o `pwd` > $*$(EXPSUFF) %$(DLSUFFIX): %.o %$(EXPSUFF) @echo Making share library $@ from $*.o, $*$(EXPSUFF), and installed postgres.imp - $(LD) -H512 -bM:SRE -bI:$(LIBDIR)/$(POSTGRES_IMP) -bE:$*$(EXPSUFF) -o $@ $*.o $(LDFLAGS) $(CFLAGS_SL) + $(LD) -H512 -bM:SRE -bI:$(libdir)/$(POSTGRES_IMP) -bE:$*$(EXPSUFF) -o $@ $*.o $(LDFLAGS) $(CFLAGS_SL) diff --git a/src/makefiles/Makefile.hpux b/src/makefiles/Makefile.hpux index ad2b932d64..de2b87d613 100644 --- a/src/makefiles/Makefile.hpux +++ b/src/makefiles/Makefile.hpux @@ -19,11 +19,11 @@ ifneq ($(HPUXMATHLIB),) LDFLAGS:= -L /lib/pa1.1 $(LDFLAGS) endif -# On all HPUX versions, embed LIBDIR as the shared library search path +# On all HPUX versions, embed `libdir' as the shared library search path # so that the executables don't need SHLIB_PATH to be set, specify -z # to catch null pointer dereferences, and specify -E to make all symbols # visible to dynamically linked shared libraries. -LDFLAGS+= -Wl,+b -Wl,$(LIBDIR) -Wl,-z -Wl,-E +LDFLAGS+= -Wl,+b -Wl,$(libdir) -Wl,-z -Wl,-E # Rule for building shared libs (currently used only for regression test # shlib ... should go away, since this is not really enough knowledge) diff --git a/src/makefiles/Makefile.win b/src/makefiles/Makefile.win index b73f1f2d09..45fab0e6e2 100644 --- a/src/makefiles/Makefile.win +++ b/src/makefiles/Makefile.win @@ -2,7 +2,7 @@ CFLAGS+= -I/usr/local/include LDFLAGS+= -g DLLTOOL= dlltool DLLWRAP= dllwrap -DLLLIBS=-L/usr/local/lib -L$(LIBDIR) -L$(SRCDIR)/backend -lpostgres -lcygipc -lcygwin -lcrypt -lkernel32 +DLLLIBS=-L/usr/local/lib -L$(libdir) -L$(top_builddir)/src/backend -lpostgres -lcygipc -lcygwin -lcrypt -lkernel32 X=.exe MK_NO_LORDER=true MAKE_DLL=true @@ -11,7 +11,7 @@ SHLIB_LINK=$(DLLLIBS) %.dll: %.o $(DLLTOOL) --export-all --output-def $*.def $< - $(DLLWRAP) -o $@ --def $*.def $< $(SRCDIR)/utils/dllinit.o $(DLLLIBS) + $(DLLWRAP) -o $@ --def $*.def $< $(top_builddir)/src/utils/dllinit.o $(DLLLIBS) rm -f $*.def curdir:=$(shell pwd) |