--- sql/sqlite/Makefile.in 2012/06/07 15:12:51 1.6 +++ sql/sqlite/Makefile.in 2012/06/11 21:59:27 1.15 @@ -45,7 +45,14 @@ DIST_COMMON = README $(am__configure_dep install-sh ltmain.sh missing subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/libltdl/m4/argz.m4 \ + $(top_srcdir)/libltdl/m4/libtool.m4 \ + $(top_srcdir)/libltdl/m4/ltdl.m4 \ + $(top_srcdir)/libltdl/m4/ltoptions.m4 \ + $(top_srcdir)/libltdl/m4/ltsugar.m4 \ + $(top_srcdir)/libltdl/m4/ltversion.m4 \ + $(top_srcdir)/libltdl/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -240,13 +247,13 @@ sys_symbol_underscore = @sys_symbol_unde sysconfdir = @sysconfdir@ target_alias = @target_alias@ SUBDIRS = libltdl +ACLOCAL_AMFLAGS = -I libltdl/m4 INCLUDES = -I../../parser3/src/sql $(INCLTDL) -I$(SQLITE_INC) noinst_HEADERS = config_includes.h lib_LTLIBRARIES = libparser3sqlite.la libparser3sqlite_la_SOURCES = parser3sqlite.C -libparser3sqlite_la_LIBADD = $(LIBLTDL) libparser3sqlite_la_LDFLAGS = -module -avoid-version -libparser3sqlite_la_LINK = $(LIBTOOL) --tag=CC --mode=link $(CXXLD) $(CXXFLAGS) $(libparser3mysql_la_LDFLAGS) $(LDFLAGS) -o $@ +libparser3sqlite_la_LIBADD = $(LIBLTDL) EXTRA_DIST = config_fixed.h parser3sqlite.sln parser3sqlite.vcproj all: config_auto.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -331,7 +338,7 @@ clean-libLTLIBRARIES: rm -f "$${dir}/so_locations"; \ done libparser3sqlite.la: $(libparser3sqlite_la_OBJECTS) $(libparser3sqlite_la_DEPENDENCIES) - $(libparser3sqlite_la_LINK) -rpath $(libdir) $(libparser3sqlite_la_LDFLAGS) $(libparser3sqlite_la_OBJECTS) $(libparser3sqlite_la_LIBADD) $(LIBS) + $(CXXLINK) -rpath $(libdir) $(libparser3sqlite_la_LDFLAGS) $(libparser3sqlite_la_OBJECTS) $(libparser3sqlite_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -495,6 +502,7 @@ distclean-tags: distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) + $(mkdir_p) $(distdir)/libltdl/m4 @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ @@ -740,26 +748,11 @@ uninstall-info: uninstall-info-recursive uninstall-libLTLIBRARIES -update: - cvs update - $(MAKE) - 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 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 +# 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 # 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: