Commit26af72b

committed

Allow out-of-tree builds on mingw and cygwin

Author: Richard Evans <richard.evans@blueallegro.net>

1 parent901d419 commit26af72bCopy full SHA for 26af72b

File tree

+11

-10

lines changed

+11

-10

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`# Copyright (c) 1998, Regents of the University of California`
`7`	`7`	`#`
`8`	`8`	`# IDENTIFICATION`
`9`		`-# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.119 2008/12/11 07:34:07 petere Exp $`
	`9`	`+# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.120 2009/01/05 09:27:19 petere Exp $`
`10`	`10`	`#`
`11`	`11`	`#-------------------------------------------------------------------------`
`12`	`12`
`@@ -406,15 +406,16 @@ else # PORTNAME == cygwin \|\| PORTNAME == win32`
`406`	`406`
`407`	`407`	`# Cygwin or Win32 case`
`408`	`408`
`409`		`-DLL_DEFFILE = lib$(NAME)dll.def`
`410`		`-`
`411`	`409`	`# If SHLIB_EXPORTS is set, the rules below will build a .def file from`
`412`	`410`	`# that. Else we build a temporary one here.`
`413`	`411`	`ifeq (,$(SHLIB_EXPORTS))`
	`412`	`+DLL_DEFFILE = lib$(NAME)dll.def`
`414`	`413`	`exports_file = $(DLL_DEFFILE)`
`415`	`414`
`416`	`415`	`$(exports_file): $(OBJS)`
`417`	`416`	`$(DLLTOOL) --export-all $(DLLTOOL_DEFFLAGS) --output-def $@ $^`
	`417`	`+else`
	`418`	`+DLL_DEFFILE = $(srcdir)/lib$(NAME)dll.def`
`418`	`419`	`endif`
`419`	`420`
`420`	`421`	`$(shlib): $(OBJS) $(DLL_DEFFILE)`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,11 +21,11 @@ all: $(NAME)`
`21`	`21`
`22`	`22`	`install: all install-lib`
`23`	`23`
`24`		`-pgevent.dll:$(OBJS) pgevent.def`
`25`		`-$(DLLWRAP) --defpgevent.def -o$(NAME)$(OBJS)`
	`24`	`+pgevent.dll:pgevent.def$(OBJS)`
	`25`	`+$(DLLWRAP) --def$< -o$(NAME)$(OBJS)`
`26`	`26`
`27`	`27`	`pgmsgevent.o: pgmsgevent.rc win32ver.rc`
`28`		`-$(WINDRES)pgmsgevent.rc -opgmsgevent.o --include-dir=$(top_builddir)/src/include`
	`28`	`+$(WINDRES)$< -o$@ --include-dir=$(top_builddir)/src/include --include-dir=$(top_srcdir)/src/include --include-dir=$(srcdir)`
`29`	`29`
`30`	`30`	`all-lib:$(NAME)`
`31`	`31`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`# Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group`
`6`	`6`	`# Portions Copyright (c) 1994, Regents of the University of California`
`7`	`7`	`#`
`8`		`-# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.172 2009/01/01 17:24:03 momjian Exp $`
	`8`	`+# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.173 2009/01/05 09:27:19 petere Exp $`
`9`	`9`	`#`
`10`	`10`	`#-------------------------------------------------------------------------`
`11`	`11`
`@@ -19,7 +19,7 @@ NAME= pq`
`19`	`19`	`SO_MAJOR_VERSION= 5`
`20`	`20`	`SO_MINOR_VERSION= 2`
`21`	`21`
`22`		`-overrideCPPFLAGS := -DFRONTEND -DUNSAFE_STAT_OK -I$(srcdir)$(CPPFLAGS) -I$(top_builddir)/src/port`
	`22`	`+overrideCPPFLAGS := -DFRONTEND -DUNSAFE_STAT_OK -I$(srcdir)$(CPPFLAGS) -I$(top_builddir)/src/port -I$(top_srcdir)/src/port`
`23`	`23`	`ifneq ($(PORTNAME), win32)`
`24`	`24`	`overrideCFLAGS +=$(PTHREAD_CFLAGS)`
`25`	`25`	`endif`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# $PostgreSQL: pgsql/src/makefiles/Makefile.win32,v 1.12 2008/12/07 08:36:22 petere Exp $`
	`1`	`+# $PostgreSQL: pgsql/src/makefiles/Makefile.win32,v 1.13 2009/01/05 09:27:20 petere Exp $`
`2`	`2`
`3`	`3`	`# Use replacement include files for those missing on Win32`
`4`	`4`	`override CPPFLAGS+="-I$(top_srcdir)/src/include/port/win32"`
`@@ -67,4 +67,4 @@ win32ver.rc: $(top_srcdir)/src/port/win32ver.rc`
`67`	`67`	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*//'`';' $< >$@
`68`	`68`
`69`	`69`	`win32ver.o: win32ver.rc`
`70`		`-$(WINDRES) -i $< -o $@ --include-dir=$(top_builddir)/src/include`
	`70`	`+$(WINDRES) -i $< -o $@ --include-dir=$(top_builddir)/src/include --include-dir=$(srcdir)`

Comments

(0)