From 1a7f4ed5252dd08d9bbf26a67ddf22c38528c636 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter_e@gmx.net>
Date: Fri, 21 Mar 2003 17:18:34 +0000
Subject: Make "win" a separate port from "cygwin".  This means you can now
 configure under native Windows (MinGW that is), but you won't get very far
 compiling yet.  The dynaloader files are from Jan Wieck's patch set.

---
 src/makefiles/Makefile.cygwin | 37 +++++++++++++++++++++++++++++++++++++
 src/makefiles/Makefile.win    | 10 +---------
 2 files changed, 38 insertions(+), 9 deletions(-)
 create mode 100644 src/makefiles/Makefile.cygwin

(limited to 'src/makefiles')

diff --git a/src/makefiles/Makefile.cygwin b/src/makefiles/Makefile.cygwin
new file mode 100644
index 0000000000..d5bcf9f7d8
--- /dev/null
+++ b/src/makefiles/Makefile.cygwin
@@ -0,0 +1,37 @@
+# $Header: /cvsroot/pgsql/src/makefiles/Makefile.cygwin,v 1.1 2003/03/21 17:18:34 petere Exp $
+DLLTOOL= dlltool
+DLLWRAP= dllwrap
+BE_DLLLIBS= -L$(top_builddir)/src/backend -lpostgres
+DLLINIT = $(top_builddir)/src/utils/dllinit.o
+
+# linking with -lm or -lc causes program to crash
+# (see http://sources.redhat.com/cygwin/faq/faq.html#SEC110)
+LIBS:=$(filter-out -lm -lc, $(LIBS))
+
+AROPT = crs
+DLSUFFIX = .dll
+CFLAGS_SL =
+
+%.dll: %.o
+	$(DLLTOOL) --export-all --output-def $*.def $<
+	$(DLLWRAP) -o $@ --def $*.def $< $(DLLINIT) $(SHLIB_LINK)
+	rm -f $*.def
+
+ifneq (,$(findstring backend,$(subdir)))
+ifeq (,$(findstring conversion_procs,$(subdir)))
+override CPPFLAGS+= -DBUILDING_DLL
+endif
+endif
+
+ifneq (,$(findstring ecpg/lib,$(subdir)))
+override CPPFLAGS+= -DBUILDING_DLL
+endif
+
+# required by Python headers
+ifneq (,$(findstring src/pl/plpython,$(subdir)))
+override CPPFLAGS+= -DUSE_DL_IMPORT
+endif
+
+override javadir := '$(shell cygpath -w $(javadir))'
+
+sqlmansect = 7
diff --git a/src/makefiles/Makefile.win b/src/makefiles/Makefile.win
index 9bbabdecc7..d16afb1757 100644
--- a/src/makefiles/Makefile.win
+++ b/src/makefiles/Makefile.win
@@ -1,13 +1,9 @@
-# $Header: /cvsroot/pgsql/src/makefiles/Attic/Makefile.win,v 1.18 2002/09/05 18:28:46 petere Exp $
+# $Header: /cvsroot/pgsql/src/makefiles/Attic/Makefile.win,v 1.19 2003/03/21 17:18:34 petere Exp $
 DLLTOOL= dlltool
 DLLWRAP= dllwrap
 BE_DLLLIBS= -L$(top_builddir)/src/backend -lpostgres
 DLLINIT = $(top_builddir)/src/utils/dllinit.o
 
-# linking with -lm or -lc causes program to crash
-# (see http://sources.redhat.com/cygwin/faq/faq.html#SEC110)
-LIBS:=$(filter-out -lm -lc, $(LIBS))
-
 AROPT = crs
 DLSUFFIX = .dll
 CFLAGS_SL =
@@ -31,7 +27,3 @@ endif
 ifneq (,$(findstring src/pl/plpython,$(subdir)))
 override CPPFLAGS+= -DUSE_DL_IMPORT
 endif
-
-override javadir := '$(shell cygpath -w $(javadir))'
-
-sqlmansect = 7
-- 
cgit v1.2.1