From 2e0c0f96b58d7e70e6eee7eeec6c00804208fb0c Mon Sep 17 00:00:00 2001 From: Fish <> Date: Thu, 20 Dec 2007 04:14:17 +0000 Subject: [PATCH] update Makefiles based on new libtool & rules.mk update --- Makefile.in | 15 +++------------ configure | 2 +- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/Makefile.in b/Makefile.in index 6f9e062..47e2c12 100644 --- a/Makefile.in +++ b/Makefile.in @@ -46,7 +46,8 @@ DIST_COMMON = $(am__configure_deps) $(dist_doc_DATA) $(noinst_HEADERS) \ autotools/mkinstalldirs install-sh subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/autotools/ax_distversion.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/autotools/acinclude.m4 \ + $(top_srcdir)/autotools/ax_distversion.m4 \ $(top_srcdir)/autotools/ax_maintainer_mode_auto_silent.m4 \ $(top_srcdir)/autotools/ccdv.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -110,10 +111,6 @@ CCDV = @CCDV@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -125,8 +122,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ GREP = @GREP@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -158,12 +153,8 @@ STRIP = @STRIP@ USECCDV = @USECCDV@ VERSION = @VERSION@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -214,7 +205,7 @@ noinst_HEADERS = blsb.h blsb_la_LDFLAGS = -module -avoid-version EXTRA_DIST = autotools/ccdv.c autotools/shtool RELNOTES dist_doc_DATA = README.blsb README.blsb.html -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ distdir = @DISTDIRVERSION@ diff --git a/configure b/configure index f7cc15a..91a271f 100755 --- a/configure +++ b/configure @@ -1949,7 +1949,7 @@ fi MODPACKAGE=BLSB MODULE_MAJOR=3 MODULE_MINOR=0 -MODULE_REV=a3 +MODULE_REV=a4 VERSION=$MODULE_MAJOR.$MODULE_MINOR.$MODULE_REV cat >>confdefs.h <<_ACEOF