--- sql/pgsql/Makefile.am	2002/12/16 10:35:52	1.8
+++ sql/pgsql/Makefile.am	2012/06/09 22:38:25	1.22
@@ -1,9 +1,5 @@
 SUBDIRS = libltdl
-
-LIBTOOL_DEPS = @LIBTOOL_DEPS@
-libtool: $(LIBTOOL_DEPS)
-	$(SHELL) ./config.status --recheck
-
+ACLOCAL_AMFLAGS = -I libltdl/m4
 
 INCLUDES = -I../../parser3/src/sql $(INCLTDL) -I$(PGSQL_INC)
 
@@ -12,28 +8,12 @@ lib_LTLIBRARIES = libparser3pgsql.la
 libparser3pgsql_la_SOURCES = parser3pgsql.C
 libparser3pgsql_la_LIBADD = $(LIBLTDL)
 libparser3pgsql_la_LDFLAGS = -module -avoid-version
+libparser3pgsql_la_LINK = $(LIBTOOL) --tag=CC --mode=link $(CXXLD) $(CXXFLAGS) $(libparser3pgsql_la_LDFLAGS) $(LDFLAGS) -o $@
 
-EXTRA_DIST=config_fixed.h
-
-update:
-	cvs update
-	$(MAKE)
+EXTRA_DIST=config_fixed.h parser3pgsql.sln parser3pgsql.vcproj
 
 commit:
-	# trick to make 'make' happy at check out time
-	# without this aclocal.m4 never updates
-	# and becomes older than it's prerequisities
-	# thus causing redundant remaking:
-	# aclocal+autoconf+automake
-
-	cvs commit -m "no message" -f acinclude.m4
-#	cvs commit -m "no message" -f acconfig.h
-	cvs commit -m "no message" -f aclocal.m4
-	cvs commit -m "no message" -f Makefile.am
-	cvs commit -m "no message" -f Makefile.in
-	cvs commit -m "no message" -f configure.in
-	cvs commit -m "no message" -f configure
-
-	cvs commit
+#	trick to make 'make' happy at check out time
+#	and avoid redundant remaking: aclocal+autoconf+automake
 
-happy: update install-exec
+	cvs commit -m "no message" -f aclocal.m4 Makefile.am Makefile.in configure.in configure config_auto.h.in