--- sql/mysql/Makefile.in 2001/09/24 16:57:24 1.2 +++ sql/mysql/Makefile.in 2001/11/11 10:43:22 1.4 @@ -82,10 +82,10 @@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ INCLUDES = -I../parser3/src/sql $(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 +lib_LTLIBRARIES = libparser3mysql.la +libparser3mysql_la_SOURCES = parser3mysql.C parser3mysql.h +libparser3mysql_la_LIBADD = $(LIBLTDL) +libparser3mysql_la_LDFLAGS = -module -avoid-version ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config_auto.h @@ -97,8 +97,8 @@ 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) @@ -117,11 +117,11 @@ ltmain.sh missing mkinstalldirs DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +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: @@ -226,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: @@ -368,7 +368,7 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \