diff options
| author | Tom Lane | 2001-04-04 21:15:56 +0000 |
|---|---|---|
| committer | Tom Lane | 2001-04-04 21:15:56 +0000 |
| commit | 6faf150a3096b57a1e312ccfff6b757bf8441358 (patch) | |
| tree | ae990cc9cdb82b9871b5881a95c954322d3687d7 /src/backend | |
| parent | d3ad2ad68972ebb637439ea34c67d5b2f4e4beac (diff) | |
Fix/cleanup DLLLIBS handling for Cygwin port. If it works it's to
Jason Tishler's credit, if it's broken it's my fault ...
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/Makefile | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/backend/Makefile b/src/backend/Makefile index 10296facfda..2227be3fb5d 100644 --- a/src/backend/Makefile +++ b/src/backend/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.69 2001/04/02 03:21:23 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.70 2001/04/04 21:15:56 tgl Exp $ # #------------------------------------------------------------------------- @@ -43,11 +43,11 @@ else # win # No points for style here. How about encapsulating some of these # commands into variables? -postgres: $(DLLOBJS) $(top_builddir)/src/utils/dllinit.o postgres.def libpostgres.a +postgres: $(OBJS) $(top_builddir)/src/utils/dllinit.o postgres.def libpostgres.a dlltool --dllname $@$(X) --output-exp $@.exp --def postgres.def - gcc -g -o $@$(X) -Wl,--base-file,$@.base $@.exp $(DLLOBJS) $(DLLLIBS) + gcc -g -o $@$(X) -Wl,--base-file,$@.base $@.exp $(OBJS) $(DLLLIBS) dlltool --dllname $@$(X) --base-file $@.base --output-exp $@.exp --def postgres.def - gcc -g -o $@$(X) $@.exp $(DLLOBJS) $(DLLLIBS) + gcc -g -o $@$(X) $@.exp $(OBJS) $(DLLLIBS) rm $@.exp $@.base endif # win @@ -64,12 +64,10 @@ $(DIRS:%=%-recursive): $(top_builddir)/src/include/parser/parse.h $(top_builddir ifeq ($(MAKE_DLL), true) -DLLOBJS := $(OBJS) +postgres.def: $(OBJS) + $(DLLTOOL) --export-all --output-def $@ $(OBJS) -postgres.def: $(DLLOBJS) - $(DLLTOOL) --export-all --output-def $@ $(DLLOBJS) - -libpostgres.a: $(DLLOBJS) $(top_builddir)/src/utils/dllinit.o postgres.def +libpostgres.a: $(OBJS) $(top_builddir)/src/utils/dllinit.o postgres.def $(DLLTOOL) --dllname postgres.exe --def postgres.def --output-lib $@ endif # MAKE_DLL |