diff options
| author | Peter Eisentraut | 2009-01-05 09:27:20 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2009-01-05 09:27:20 +0000 |
| commit | a40e9a61766ad4aa841682adfa49604ca816841d (patch) | |
| tree | 85e429494a35e102cdcc2521c11763083e069f31 | |
| parent | 5bab6f226e003060e7aa949efcdf05d5c200947d (diff) | |
Allow out-of-tree builds on mingw and cygwin
Author: Richard Evans <[email protected]>
| -rw-r--r-- | src/Makefile.shlib | 5 | ||||
| -rw-r--r-- | src/bin/pgevent/Makefile | 6 | ||||
| -rw-r--r-- | src/interfaces/libpq/Makefile | 2 | ||||
| -rw-r--r-- | src/makefiles/Makefile.win32 | 2 |
4 files changed, 8 insertions, 7 deletions
diff --git a/src/Makefile.shlib b/src/Makefile.shlib index 6aeaab4ddd..a75d8b06ba 100644 --- a/src/Makefile.shlib +++ b/src/Makefile.shlib @@ -406,15 +406,16 @@ else # PORTNAME == cygwin || PORTNAME == win32 # Cygwin or Win32 case -DLL_DEFFILE = lib$(NAME)dll.def - # If SHLIB_EXPORTS is set, the rules below will build a .def file from # that. Else we build a temporary one here. ifeq (,$(SHLIB_EXPORTS)) +DLL_DEFFILE = lib$(NAME)dll.def exports_file = $(DLL_DEFFILE) $(exports_file): $(OBJS) $(DLLTOOL) --export-all $(DLLTOOL_DEFFLAGS) --output-def $@ $^ +else +DLL_DEFFILE = $(srcdir)/lib$(NAME)dll.def endif $(shlib): $(OBJS) $(DLL_DEFFILE) diff --git a/src/bin/pgevent/Makefile b/src/bin/pgevent/Makefile index 3512e6e642..6b61b93bdc 100644 --- a/src/bin/pgevent/Makefile +++ b/src/bin/pgevent/Makefile @@ -21,11 +21,11 @@ all: $(NAME) install: all install-lib -pgevent.dll: $(OBJS) pgevent.def - $(DLLWRAP) --def pgevent.def -o $(NAME) $(OBJS) +pgevent.dll: pgevent.def $(OBJS) + $(DLLWRAP) --def $< -o $(NAME) $(OBJS) pgmsgevent.o: pgmsgevent.rc win32ver.rc - $(WINDRES) pgmsgevent.rc -o pgmsgevent.o --include-dir=$(top_builddir)/src/include + $(WINDRES) $< -o $@ --include-dir=$(top_builddir)/src/include --include-dir=$(top_srcdir)/src/include --include-dir=$(srcdir) all-lib: $(NAME) diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile index 7512a016d7..3b9df766e5 100644 --- a/src/interfaces/libpq/Makefile +++ b/src/interfaces/libpq/Makefile @@ -19,7 +19,7 @@ NAME= pq SO_MAJOR_VERSION= 5 SO_MINOR_VERSION= 2 -override CPPFLAGS := -DFRONTEND -DUNSAFE_STAT_OK -I$(srcdir) $(CPPFLAGS) -I$(top_builddir)/src/port +override CPPFLAGS := -DFRONTEND -DUNSAFE_STAT_OK -I$(srcdir) $(CPPFLAGS) -I$(top_builddir)/src/port -I$(top_srcdir)/src/port ifneq ($(PORTNAME), win32) override CFLAGS += $(PTHREAD_CFLAGS) endif diff --git a/src/makefiles/Makefile.win32 b/src/makefiles/Makefile.win32 index cda1c155ef..3605b0b635 100644 --- a/src/makefiles/Makefile.win32 +++ b/src/makefiles/Makefile.win32 @@ -67,4 +67,4 @@ win32ver.rc: $(top_srcdir)/src/port/win32ver.rc sed -e 's;FILEDESC;$(PGFILEDESC);' -e 's;VFT_APP;$(PGFTYPE);' -e 's;_ICO_;$(PGICOSTR);' -e 's;\(VERSION.*\),0 *$$;\1,'`date '+%y%j' | sed 's/^0*//'`';' $< >$@ win32ver.o: win32ver.rc - $(WINDRES) -i $< -o $@ --include-dir=$(top_builddir)/src/include + $(WINDRES) -i $< -o $@ --include-dir=$(top_builddir)/src/include --include-dir=$(srcdir) |