--- sql/mysql/Makefile.in	2001/09/21 15:40:55	1.1.1.1
+++ sql/mysql/Makefile.in	2002/02/08 10:21:41	1.5
@@ -77,12 +77,18 @@ RANLIB = @RANLIB@
 VERSION = @VERSION@
 
 SUBDIRS = libltdl
+
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
-INCLUDES = -I.. $(INCLTDL) -I$(MYSQL_INC)
-lib_LTLIBRARIES = parser3mysql.la
-parser3mysql_la_SOURCES = parser3mysql.C parser3mysql.h
-parser3mysql_la_LIBADD = $(LIBLTDL)
-parser3mysql_la_LDFLAGS = -module -avoid-version
+
+INCLUDES = -I../parser3/src/sql $(INCLTDL) -I$(MYSQL_INC)
+
+noinst_HEADERS = config_includes.h
+lib_LTLIBRARIES = libparser3mysql.la
+libparser3mysql_la_SOURCES = parser3mysql.C
+libparser3mysql_la_LIBADD = $(LIBLTDL)
+libparser3mysql_la_LDFLAGS = -module -avoid-version
+
+EXTRA_DIST = config_fixed.h
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config_auto.h
@@ -94,18 +100,15 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I.
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
-parser3mysql_la_DEPENDENCIES = 
-parser3mysql_la_OBJECTS =  parser3mysql.lo
+libparser3mysql_la_DEPENDENCIES = 
+libparser3mysql_la_OBJECTS =  parser3mysql.lo
 CXXFLAGS = @CXXFLAGS@
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+HEADERS =  $(noinst_HEADERS)
+
 DIST_COMMON =  README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \
 Makefile.am Makefile.in NEWS acinclude.m4 aclocal.m4 config.guess \
 config.sub config_auto.h.in configure configure.in install-sh ltconfig \
@@ -117,8 +120,8 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(
 TAR = tar
 GZIP_ENV = --best
 DEP_FILES =  .deps/parser3mysql.P
-SOURCES = $(parser3mysql_la_SOURCES)
-OBJECTS = $(parser3mysql_la_OBJECTS)
+SOURCES = $(libparser3mysql_la_SOURCES)
+OBJECTS = $(libparser3mysql_la_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
@@ -223,8 +226,8 @@ distclean-libtool:
 
 maintainer-clean-libtool:
 
-parser3mysql.la: $(parser3mysql_la_OBJECTS) $(parser3mysql_la_DEPENDENCIES)
-	$(CXXLINK) -rpath $(libdir) $(parser3mysql_la_LDFLAGS) $(parser3mysql_la_OBJECTS) $(parser3mysql_la_LIBADD) $(LIBS)
+libparser3mysql.la: $(libparser3mysql_la_OBJECTS) $(libparser3mysql_la_DEPENDENCIES)
+	$(CXXLINK) -rpath $(libdir) $(libparser3mysql_la_LDFLAGS) $(libparser3mysql_la_OBJECTS) $(libparser3mysql_la_LIBADD) $(LIBS)
 .C.o:
 	$(CXXCOMPILE) -c $<
 .C.lo:
@@ -455,7 +458,7 @@ install-am: all-am
 install: install-recursive
 uninstall-am: uninstall-libLTLIBRARIES
 uninstall: uninstall-recursive
-all-am: Makefile $(LTLIBRARIES) config_auto.h
+all-am: Makefile $(LTLIBRARIES) $(HEADERS) config_auto.h
 all-redirect: all-recursive-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
@@ -524,14 +527,9 @@ uninstall-am uninstall all-redirect all-
 installdirs mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
-
 libtool: $(LIBTOOL_DEPS)
 	$(SHELL) ./config.status --recheck
 
-
-
-
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: