diff --git a/Makefile.in b/Makefile.in index 023d508..1f586f8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -83,6 +83,10 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BUILD_LIBBZ2_FALSE = @BUILD_LIBBZ2_FALSE@ +BUILD_LIBBZ2_TRUE = @BUILD_LIBBZ2_TRUE@ +BUILD_LIBZ_FALSE = @BUILD_LIBZ_FALSE@ +BUILD_LIBZ_TRUE = @BUILD_LIBZ_TRUE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ diff --git a/configure b/configure index 4894f6f..7d4ffc2 100755 --- a/configure +++ b/configure @@ -462,7 +462,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE RANLIB ac_ct_RANLIB HELP2MAN USE_HELP2MAN_TRUE USE_HELP2MAN_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL XGPERF YACC LIBOBJS USE_LXT_TRUE USE_LXT_FALSE USE_LXT2_TRUE USE_LXT2_FALSE LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE RANLIB ac_ct_RANLIB HELP2MAN USE_HELP2MAN_TRUE USE_HELP2MAN_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL XGPERF YACC BUILD_LIBZ_TRUE BUILD_LIBZ_FALSE BUILD_LIBBZ2_TRUE BUILD_LIBBZ2_FALSE LIBOBJS USE_LXT_TRUE USE_LXT_FALSE USE_LXT2_TRUE USE_LXT2_FALSE LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -20002,7 +20002,6 @@ then echo "" fi -#AC_PROG_YACC for ac_prog in bison do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -20130,6 +20129,16 @@ _ACEOF fi + + +if test "$ac_cv_lib_z_gzwrite" = no; then + BUILD_LIBZ_TRUE= + BUILD_LIBZ_FALSE='#' +else + BUILD_LIBZ_TRUE='#' + BUILD_LIBZ_FALSE= +fi + echo "$as_me:$LINENO: checking for BZ2_bzwrite in -lbz2" >&5 echo $ECHO_N "checking for BZ2_bzwrite in -lbz2... $ECHO_C" >&6 if test "${ac_cv_lib_bz2_BZ2_bzwrite+set}" = set; then @@ -20203,33 +20212,18 @@ _ACEOF fi -if test X"$ac_cv_enable_lxt" = Xyes; then - if test X"$ac_cv_lib_z_gzwrite" = Xno; then - echo "" - echo "*** Error: libz not found. lxt waveform dumping" - echo " cannot be built. Rerun configure with --disable-lxt." - echo "" - exit 1; - fi - if test X"$ac_cv_lib_z_BZ2_bzwrite" = Xno; then - echo "" - echo "*** Error: libbz2 not found. lxt waveform dumping" - echo " cannot be built. Rerun configure with --disable-lxt." - echo "" - exit 1; - fi -fi -if test X"$ac_cv_enable_lxt2" = Xyes; then - if test X"$ac_cv_lib_z_gzwrite" = Xno; then - echo "" - echo "*** Error: libz not found. lxt2 waveform dumping" - echo " cannot be built. Rerun configure with --disable-lxt2." - echo "" - exit 1; - fi + +if test "$ac_cv_lib_bz2_BZ2_bzwrite" = no; then + BUILD_LIBBZ2_TRUE= + BUILD_LIBBZ2_FALSE='#' +else + BUILD_LIBBZ2_TRUE='#' + BUILD_LIBBZ2_FALSE= fi + + echo "$as_me:$LINENO: checking for a readline compatible library" >&5 echo $ECHO_N "checking for a readline compatible library... $ECHO_C" >&6 if test "${vl_cv_lib_readline+set}" = set; then @@ -22618,7 +22612,7 @@ _ACEOF fi - ac_config_files="$ac_config_files Makefile replace/Makefile src/Makefile lxt/Makefile doc/Makefile" + ac_config_files="$ac_config_files Makefile replace/Makefile replace/libz/Makefile replace/libbz2/Makefile src/Makefile lxt/Makefile doc/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -22739,6 +22733,20 @@ echo "$as_me: error: conditional \"USE_HELP2MAN\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${BUILD_LIBZ_TRUE}" && test -z "${BUILD_LIBZ_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"BUILD_LIBZ\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"BUILD_LIBZ\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${BUILD_LIBBZ2_TRUE}" && test -z "${BUILD_LIBBZ2_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"BUILD_LIBBZ2\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"BUILD_LIBBZ2\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${USE_LXT_TRUE}" && test -z "${USE_LXT_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"USE_LXT\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -23199,6 +23207,8 @@ do # Handling of arguments. "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "replace/Makefile" ) CONFIG_FILES="$CONFIG_FILES replace/Makefile" ;; + "replace/libz/Makefile" ) CONFIG_FILES="$CONFIG_FILES replace/libz/Makefile" ;; + "replace/libbz2/Makefile" ) CONFIG_FILES="$CONFIG_FILES replace/libbz2/Makefile" ;; "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "lxt/Makefile" ) CONFIG_FILES="$CONFIG_FILES lxt/Makefile" ;; "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; @@ -23359,6 +23369,10 @@ s,@ac_ct_F77@,$ac_ct_F77,;t t s,@LIBTOOL@,$LIBTOOL,;t t s,@XGPERF@,$XGPERF,;t t s,@YACC@,$YACC,;t t +s,@BUILD_LIBZ_TRUE@,$BUILD_LIBZ_TRUE,;t t +s,@BUILD_LIBZ_FALSE@,$BUILD_LIBZ_FALSE,;t t +s,@BUILD_LIBBZ2_TRUE@,$BUILD_LIBBZ2_TRUE,;t t +s,@BUILD_LIBBZ2_FALSE@,$BUILD_LIBBZ2_FALSE,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@USE_LXT_TRUE@,$USE_LXT_TRUE,;t t s,@USE_LXT_FALSE@,$USE_LXT_FALSE,;t t diff --git a/doc/Makefile.in b/doc/Makefile.in index e051340..203ff63 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -61,6 +61,10 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BUILD_LIBBZ2_FALSE = @BUILD_LIBBZ2_FALSE@ +BUILD_LIBBZ2_TRUE = @BUILD_LIBBZ2_TRUE@ +BUILD_LIBZ_FALSE = @BUILD_LIBZ_FALSE@ +BUILD_LIBZ_TRUE = @BUILD_LIBZ_TRUE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ diff --git a/lxt/Makefile.in b/lxt/Makefile.in index f8a797b..41c44d6 100644 --- a/lxt/Makefile.in +++ b/lxt/Makefile.in @@ -83,6 +83,10 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BUILD_LIBBZ2_FALSE = @BUILD_LIBBZ2_FALSE@ +BUILD_LIBBZ2_TRUE = @BUILD_LIBBZ2_TRUE@ +BUILD_LIBZ_FALSE = @BUILD_LIBZ_FALSE@ +BUILD_LIBZ_TRUE = @BUILD_LIBZ_TRUE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -183,10 +187,12 @@ target_alias = @target_alias@ @USE_LXT2_TRUE@LXTLIB = liblxt.la @USE_LXT_TRUE@LXTLIB = liblxt.la @USE_LXT2_TRUE@LXT2SOURCE = lxt2.c lxt2_write.c lxt2_write.h +@BUILD_LIBZ_TRUE@LIBZ_INCLUDE = -I $(top_srcdir)/replace/libz +@BUILD_LIBBZ2_TRUE@LIBBZ2_INCLUDE = -I $(top_srcdir)/replace/libbz2 noinst_LTLIBRARIES = $(LXTLIB) liblxt_la_SOURCES = $(LXTSOURCE) $(LXT2SOURCE) liblxt_la_LDFLAGS = -version-info 0:0:0 -AM_CFLAGS = -I $(top_srcdir)/src +AM_CFLAGS = -I $(top_srcdir)/src $(LIBZ_INCLUDE) $(LIBBZ2_INCLUDE) EXTRA_DIST = LXT_Explained.html test.v lxt.tab MAINTAINERCLEANFILES = Makefile.in all: all-am diff --git a/replace/Makefile.in b/replace/Makefile.in index 2c5a9b6..d362aef 100644 --- a/replace/Makefile.in +++ b/replace/Makefile.in @@ -51,7 +51,12 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) am__DEPENDENCIES_1 = @LTLIBOBJS@ -libreplace_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +@BUILD_LIBZ_TRUE@am__DEPENDENCIES_2 = \ +@BUILD_LIBZ_TRUE@ $(top_builddir)/replace/libz/libz.la +@BUILD_LIBBZ2_TRUE@am__DEPENDENCIES_3 = \ +@BUILD_LIBBZ2_TRUE@ $(top_builddir)/replace/libbz2/libbz2.la +libreplace_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) am_libreplace_la_OBJECTS = libreplace_la_OBJECTS = $(am_libreplace_la_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) @@ -67,8 +72,15 @@ LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(libreplace_la_SOURCES) DIST_SOURCES = $(libreplace_la_SOURCES) +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-exec-recursive install-info-recursive \ + install-recursive installcheck-recursive installdirs-recursive \ + pdf-recursive ps-recursive uninstall-info-recursive \ + uninstall-recursive ETAGS = etags CTAGS = ctags +DIST_SUBDIRS = libz libbz2 . DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -79,6 +91,10 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BUILD_LIBBZ2_FALSE = @BUILD_LIBBZ2_FALSE@ +BUILD_LIBBZ2_TRUE = @BUILD_LIBBZ2_TRUE@ +BUILD_LIBZ_FALSE = @BUILD_LIBZ_FALSE@ +BUILD_LIBZ_TRUE = @BUILD_LIBZ_TRUE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -175,12 +191,17 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +@BUILD_LIBZ_TRUE@LIBZ_DIR = libz +@BUILD_LIBZ_TRUE@LIBZ_LIB = $(top_builddir)/replace/libz/libz.la +@BUILD_LIBBZ2_TRUE@LIBBZ2_DIR = libbz2 +@BUILD_LIBBZ2_TRUE@LIBBZ2_LIB = $(top_builddir)/replace/libbz2/libbz2.la +SUBDIRS = $(LIBZ_DIR) $(LIBBZ2_DIR) . INCLUDES = -I$(top_builddir) -I$(top_srcdir) noinst_LTLIBRARIES = libreplace.la libreplace_la_SOURCES = -libreplace_la_LIBADD = $(LTLIBOBJS) +libreplace_la_LIBADD = $(LTLIBOBJS) $(LIBZ_LIB) $(LIBBZ2_LIB) MAINTAINERCLEANFILES = Makefile.in -all: all-am +all: all-recursive .SUFFIXES: .SUFFIXES: .c .lo .o .obj @@ -266,6 +287,77 @@ distclean-libtool: -rm -f libtool uninstall-info-am: +# This directory's subdirectories are mostly independent; you can cd +# into them and run `make' without going through this Makefile. +# To change the values of `make' variables: instead of editing Makefiles, +# (1) if the variable is set in `config.status', edit `config.status' +# (which will cause the Makefiles to be regenerated when you run `make'); +# (2) otherwise, pass the desired values on the `make' command line. +$(RECURSIVE_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +mostlyclean-recursive clean-recursive distclean-recursive \ +maintainer-clean-recursive: + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + rev=''; for subdir in $$list; do \ + if test "$$subdir" = "."; then :; else \ + rev="$$subdir $$rev"; \ + fi; \ + done; \ + rev="$$rev ."; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done && test -z "$$fail" +tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done +ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -276,10 +368,23 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) mkid -fID $$unique tags: TAGS -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ @@ -292,7 +397,7 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$tags $$unique; \ fi ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ @@ -341,19 +446,35 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ + || $(mkdir_p) "$(distdir)/$$subdir" \ + || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ + distdir) \ + || exit 1; \ + fi; \ + done check-am: all-am -check: check-am +check: check-recursive all-am: Makefile $(LTLIBRARIES) -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am +installdirs: installdirs-recursive +installdirs-am: +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -installcheck: installcheck-am +installcheck: installcheck-recursive install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ @@ -370,24 +491,24 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) -clean: clean-am +clean: clean-recursive clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ mostlyclean-am -distclean: distclean-am +distclean: distclean-recursive -rm -rf $(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-libtool distclean-tags -dvi: dvi-am +dvi: dvi-recursive dvi-am: -html: html-am +html: html-recursive -info: info-am +info: info-recursive info-am: @@ -395,43 +516,47 @@ install-data-am: install-exec-am: -install-info: install-info-am +install-info: install-info-recursive install-man: installcheck-am: -maintainer-clean: maintainer-clean-am +maintainer-clean: maintainer-clean-recursive -rm -rf $(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic -mostlyclean: mostlyclean-am +mostlyclean: mostlyclean-recursive mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool -pdf: pdf-am +pdf: pdf-recursive pdf-am: -ps: ps-am +ps: ps-recursive ps-am: uninstall-am: uninstall-info-am -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES ctags distclean \ +uninstall-info: uninstall-info-recursive + +.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ + clean clean-generic clean-libtool clean-noinstLTLIBRARIES \ + clean-recursive ctags ctags-recursive distclean \ distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-info-am + distclean-recursive distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-exec install-exec-am install-info \ + install-info-am install-man install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic maintainer-clean-recursive \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am uninstall-info-am # 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. diff --git a/src/Makefile.in b/src/Makefile.in index 233df9a..109213b 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -122,6 +122,10 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BUILD_LIBBZ2_FALSE = @BUILD_LIBBZ2_FALSE@ +BUILD_LIBBZ2_TRUE = @BUILD_LIBBZ2_TRUE@ +BUILD_LIBZ_FALSE = @BUILD_LIBZ_FALSE@ +BUILD_LIBZ_TRUE = @BUILD_LIBZ_TRUE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -218,9 +222,8 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -@USE_LXT2_TRUE@ZLIB = -lz -@USE_LXT_TRUE@ZLIB = -lz -@USE_LXT_TRUE@BZ2LIB = -lbz2 +@BUILD_LIBZ_FALSE@ZLIB = -lz +@BUILD_LIBBZ2_FALSE@BZ2LIB = -lbz2 @USE_LXT2_TRUE@LIBLXT = $(top_builddir)/lxt/liblxt.la @USE_LXT_TRUE@LIBLXT = $(top_builddir)/lxt/liblxt.la nobase_include_HEADERS = veriuser.h acc_user.h veriuser.c