--- sql/pgsql/Makefile.am	2012/06/09 22:38:25	1.22
+++ sql/pgsql/Makefile.am	2015/10/26 16:29:10	1.35
@@ -1,14 +1,13 @@
 SUBDIRS = libltdl
 ACLOCAL_AMFLAGS = -I libltdl/m4
 
-INCLUDES = -I../../parser3/src/sql $(INCLTDL) -I$(PGSQL_INC)
+AM_CPPFLAGS = -I../../parser3/src/sql $(INCLTDL) -I$(PGSQL_INC)
 
 noinst_HEADERS = config_includes.h
 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 $@
+libparser3pgsql_la_LIBADD = $(LIBLTDL)
 
 EXTRA_DIST=config_fixed.h parser3pgsql.sln parser3pgsql.vcproj
 
@@ -16,4 +15,4 @@ commit:
 #	trick to make 'make' happy at check out time
 #	and avoid redundant remaking: aclocal+autoconf+automake
 
-	cvs commit -m "no message" -f aclocal.m4 Makefile.am Makefile.in configure.in configure config_auto.h.in
+	cvs commit -m "no message" -f aclocal.m4 Makefile.am Makefile.in configure.ac configure config_auto.h.in