--- sql/mysql/Makefile.in 2012/06/09 22:41:17 1.28 +++ sql/mysql/Makefile.in 2012/06/11 20:51:38 1.31 @@ -69,8 +69,7 @@ am__strip_dir = `echo $$p | sed -e 's|^. am__installdirs = "$(DESTDIR)$(libdir)" libLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(lib_LTLIBRARIES) -am__DEPENDENCIES_1 = -libparser3mysql_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +libparser3mysql_la_LIBADD = am_libparser3mysql_la_OBJECTS = parser3mysql.lo libparser3mysql_la_OBJECTS = $(am_libparser3mysql_la_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I. @@ -252,9 +251,7 @@ INCLUDES = -I../../parser3/src/sql $(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 -libparser3mysql_la_LINK = $(LIBTOOL) --tag=CC --mode=link $(CXXLD) $(CXXFLAGS) $(libparser3mysql_la_LDFLAGS) $(LDFLAGS) -o $@ EXTRA_DIST = config_fixed.h parser3mysql.sln parser3mysql.vcproj all: config_auto.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -339,7 +336,7 @@ clean-libLTLIBRARIES: rm -f "$${dir}/so_locations"; \ done libparser3mysql.la: $(libparser3mysql_la_OBJECTS) $(libparser3mysql_la_DEPENDENCIES) - $(libparser3mysql_la_LINK) -rpath $(libdir) $(libparser3mysql_la_LDFLAGS) $(libparser3mysql_la_OBJECTS) $(libparser3mysql_la_LIBADD) $(LIBS) + $(CXXLINK) -rpath $(libdir) $(libparser3mysql_la_LDFLAGS) $(libparser3mysql_la_OBJECTS) $(libparser3mysql_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT)