diff options
| author | Peter Eisentraut | 2009-08-28 20:26:19 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2009-08-28 20:26:19 +0000 |
| commit | 234c7ce9f2a0c8262d3b3a3fe3970c337f9f0286 (patch) | |
| tree | f881958d457dbdf19baac1f5e8d11601e1e64b5e /src/Makefile.shlib | |
| parent | 0a00c9a8efe95180d23705d92e67a581828f50ce (diff) | |
Derived files that are shipped in the distribution used to be built in the
source directory even for out-of-tree builds. They are now alsl built in
the build tree. This should be more convenient for certain developers'
workflows, and shouldn't really break anything else.
Diffstat (limited to 'src/Makefile.shlib')
| -rw-r--r-- | src/Makefile.shlib | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/Makefile.shlib b/src/Makefile.shlib index e8d63292dc..add201d007 100644 --- a/src/Makefile.shlib +++ b/src/Makefile.shlib @@ -6,7 +6,7 @@ # Copyright (c) 1998, Regents of the University of California # # IDENTIFICATION -# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.122 2009/08/27 17:55:53 tgl Exp $ +# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.123 2009/08/28 20:26:18 petere Exp $ # #------------------------------------------------------------------------- @@ -415,7 +415,7 @@ exports_file = $(DLL_DEFFILE) $(exports_file): $(OBJS) $(DLLTOOL) --export-all $(DLLTOOL_DEFFLAGS) --output-def $@ $^ else -DLL_DEFFILE = $(srcdir)/lib$(NAME)dll.def +DLL_DEFFILE = lib$(NAME)dll.def endif $(shlib): $(OBJS) $(DLL_DEFFILE) @@ -436,23 +436,23 @@ endif # enable_shared # tarballs. ifneq (,$(SHLIB_EXPORTS)) -distprep: $(srcdir)/lib$(NAME)dll.def $(srcdir)/lib$(NAME)ddll.def $(srcdir)/blib$(NAME)dll.def +distprep: lib$(NAME)dll.def lib$(NAME)ddll.def blib$(NAME)dll.def UC_NAME = $(shell echo $(NAME) | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ') -$(srcdir)/lib$(NAME)dll.def: $(SHLIB_EXPORTS) +lib$(NAME)dll.def: $(SHLIB_EXPORTS) echo '; DEF file for MS VC++' >$@ echo 'LIBRARY LIB$(UC_NAME)' >>$@ echo 'EXPORTS' >>$@ sed -e '/^#/d' -e 's/^\(.*[ ]\)\([0-9][0-9]*\)/ \1@ \2/' $< >>$@ -$(srcdir)/lib$(NAME)ddll.def: $(SHLIB_EXPORTS) +lib$(NAME)ddll.def: $(SHLIB_EXPORTS) echo '; DEF file for MS VC++' >$@ echo 'LIBRARY LIB$(UC_NAME)D' >>$@ echo 'EXPORTS' >>$@ sed -e '/^#/d' -e 's/^\(.*[ ]\)\([0-9][0-9]*\)/ \1@ \2/' $< >>$@ -$(srcdir)/blib$(NAME)dll.def: $(SHLIB_EXPORTS) +blib$(NAME)dll.def: $(SHLIB_EXPORTS) echo '; DEF file for Borland C++ Builder' >$@ echo 'LIBRARY BLIB$(UC_NAME)' >>$@ echo 'EXPORTS' >>$@ @@ -551,5 +551,5 @@ clean-lib: ifneq (,$(SHLIB_EXPORTS)) maintainer-clean-lib: - rm -f $(srcdir)/lib$(NAME)dll.def $(srcdir)/lib$(NAME)ddll.def $(srcdir)/blib$(NAME)dll.def + rm -f lib$(NAME)dll.def lib$(NAME)ddll.def blib$(NAME)dll.def endif |