Makefile cleanup for interface tree. Now essentially with all the

standard targets and behaviour. Replaced Makefile.in's with
Makefile's and declared the respective variables in Makefile.global.

maintainer-clean target now available at top level, although it does
not work in the backend tree yet.

Cleanup pass over Makefile.shlib, renamed some targets and variables.
The shared library symlink tests are now done by make, not the shell.

ecpg: Remove one warning in sloppy flex output.

PL/Perl and Perl interface: the MakeMaker documentation is confusing,
the realclean target *does* "delete derived files", but it also
uninstalls them. Don't use that.

The submake targets in the various bin directories that update libpq
should `make all', not `make libpq.a'. That is a) unportable, and
b) doesn't build the shared library.

diff --git a/GNUmakefile b/GNUmakefile
new file mode 100644 (file)
index 0000000..25a7d98
--- /dev/null
+++ b/GNUmakefile
@@ -0,0 +1,62 @@
+#-------------------------------------------------------------------------
+#
+# GNUMakefile for psqlodbc (Postgres ODBC driver)
+#
+# $Header: /home/heikki/psqlodbc-cvs-copy/psqlodbc/Attic/GNUmakefile,v 1.1 2000/06/28 18:29:54 petere Exp $
+#
+#-------------------------------------------------------------------------
+
+subdir = src/interfaces/odbc
+top_builddir = ../../..
+include ../../Makefile.global
+
+# Shared library parameters
+NAME = psqlodbc
+SO_MAJOR_VERSION = 0
+SO_MINOR_VERSION = 26
+
+CFLAGS += -I$(srcdir) -DHAVE_CONFIG_H -DODBCINSTDIR='"$(odbcinst_ini_dir)"'
+
+
+OBJS = info.o bind.o columninfo.o connection.o convert.o drvconn.o \
+        environ.o execute.o lobj.o misc.o options.o \
+        pgtypes.o psqlodbc.o qresult.o results.o socket.o parse.o statement.o \
+        gpps.o tuple.o tuplelist.o dlg_specific.o $(OBJX)
+
+SHLIB_LINK= $(LD_FLAGS)
+
+all: all-lib
+
+# Shared library stuff
+include $(top_srcdir)/src/Makefile.shlib
+
+LDFLAGS_SL+= $(LDFLAGS_ODBC)
+
+odbc_headers = isql.h isqlext.h iodbc.h
+odbc_includedir = $(includedir)/iodbc
+
+install: all installdirs install-headers install-ini install-lib
+
+installdirs:
+   $(mkinstalldirs) $(odbc_includedir) $(libdir) $(odbcinst_ini_dir)
+
+.PHONY: install-headers
+install-headers: $(odbc_headers)
+   for i in $^; do $(INSTALL_DATA) $$i $(odbc_includedir) || exit 1; done
+
+.PHONY: install-ini
+install-ini: odbcinst.ini
+   $(INSTALL_DATA) $< $(odbcinst_ini_dir)
+
+uninstall: uninstall-lib
+   rm -f $(addprefix $(odbc_includedir)/, $(odbc_headers))
+
+clean distclean maintainer-clean: clean-lib
+   rm -f $(OBJS)
+
+depend dep:
+   $(CC) -MM $(CFLAGS) *.c >depend
+
+ifeq (depend,$(wildcard depend))
+include depend
+endif

diff --git a/GNUmakefile.in b/GNUmakefile.in
deleted file mode 100644 (file)
index 99375e9..0000000
--- a/GNUmakefile.in
+++ /dev/null
@@ -1,77 +0,0 @@
-#-------------------------------------------------------------------------
-#
-# GNUMakefile.in for psqlodbc (Postgres ODBC driver).
-#
-# $Header: /home/heikki/psqlodbc-cvs-copy/psqlodbc/Attic/GNUmakefile.in,v 1.17 2000/06/20 16:39:57 petere Exp $
-#
-#-------------------------------------------------------------------------
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = src/interfaces/odbc
-
-mkinstalldirs = @mkinstalldirs@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-
-prefix = @prefix@
-datadir = @datadir@
-odbcinst_ini_dir = @odbcinst_ini_dir@
-includedir = @includedir@
-
-# Shared library parameters
-NAME = psqlodbc
-SO_MAJOR_VERSION = 0
-SO_MINOR_VERSION = 26
-
-
-SRCDIR= $(top_srcdir)/src
-include $(SRCDIR)/Makefile.global
-
-CFLAGS += -I. @DEFS@ -DODBCINSTDIR='"$(odbcinst_ini_dir)"'
-
-
-OBJS = info.o bind.o columninfo.o connection.o convert.o drvconn.o \
-        environ.o execute.o lobj.o misc.o options.o \
-        pgtypes.o psqlodbc.o qresult.o results.o socket.o parse.o statement.o \
-        gpps.o tuple.o tuplelist.o dlg_specific.o
-
-
-# Shared library stuff, also default 'all' target
-include $(SRCDIR)/Makefile.shlib
-
-install: all installdirs install-headers install-ini install-lib $(install-shlib-dep)
-
-installdirs:
-   $(mkinstalldirs) $(includedir)/iodbc $(LIBDIR) $(odbcinst_ini_dir)
-
-install-headers: isql.h isqlext.h iodbc.h
-   $(INSTALL_DATA) $^ $(includedir)/iodbc/
-
-install-ini: odbcinst.ini
-   $(INSTALL_DATA) odbcinst.ini $(odbcinst_ini_dir)
-
-clean: clean-shlib
-   rm -f lib$(NAME).a $(OBJS)
-
-distclean maintainer-clean: clean
-   rm -f GNUmakefile
-
-
-depend dep:
-   $(CC) -MM $(CFLAGS) *.c >depend
-
-ifeq (depend,$(wildcard depend))
-include depend
-endif
-
-.PHONY: all install installdirs install-headers install-lib install-ini clean distclean maintainer-clean
-
-
-GNUmakefile: GNUmakefile.in $(top_builddir)/config.status
-   cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
-
-$(top_builddir)/config.status: $(top_srcdir)/configure
-   cd $(top_builddir) && ./config.status --recheck