From 03622ed0f0ca7074fd5d5ca1b533659a40b6bf27 Mon Sep 17 00:00:00 2001 From: Brian Cox Date: Tue, 14 Jun 2016 01:15:37 -0700 Subject: [PATCH] Specify headers in makefiles, so 'make dist' knows to include them --- src/core/Makefile.am | 15 ++++- src/core/Makefile.in | 91 +++++++++++++++++++++++++---- src/cryptlib/Makefile.am | 7 +++ src/cryptlib/Makefile.in | 83 ++++++++++++++++++++++---- src/db/Makefile.am | 5 ++ src/db/Makefile.in | 81 +++++++++++++++++++++---- src/fco/Makefile.am | 16 ++++- src/fco/Makefile.in | 89 ++++++++++++++++++++++++---- src/fs/Makefile.am | 7 +++ src/fs/Makefile.in | 83 ++++++++++++++++++++++---- src/siggen/Makefile.am | 4 ++ src/siggen/Makefile.in | 76 ++++++++++++++++++++---- src/tripwire/Makefile.am | 6 ++ src/tripwire/Makefile.in | 78 +++++++++++++++++++++---- src/tw/Makefile.am | 8 +++ src/tw/Makefile.in | 84 ++++++++++++++++++++++---- src/twadmin/Makefile.am | 5 ++ src/twadmin/Makefile.in | 77 ++++++++++++++++++++---- src/twcrypto/Makefile.am | 5 ++ src/twcrypto/Makefile.in | 81 +++++++++++++++++++++---- src/twparser/Makefile.am | 6 ++ src/twparser/Makefile.in | 82 ++++++++++++++++++++++---- src/twprint/Makefile.am | 5 ++ src/twprint/Makefile.in | 77 ++++++++++++++++++++---- src/twtest/Makefile.am | 5 ++ src/twtest/Makefile.in | 74 +++++++++++++++++++---- src/{core => twtest}/stringutil_t.h | 4 +- src/twtest/test.cpp | 2 +- src/util/Makefile.am | 4 ++ src/util/Makefile.in | 80 +++++++++++++++++++++---- 30 files changed, 1094 insertions(+), 146 deletions(-) rename src/{core => twtest}/stringutil_t.h (99%) diff --git a/src/core/Makefile.am b/src/core/Makefile.am index e502b70..7a7ad7f 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am @@ -3,6 +3,7 @@ AUTOMAKE_OPTIONS = foreign no-dependencies AM_CPPFLAGS = -I.. noinst_LIBRARIES = libcore.a +libcore_adir=. libcore_a_SOURCES = \ file_unix.cpp unixfsservices.cpp \ archive.cpp charutil.cpp \ @@ -12,12 +13,24 @@ libcore_a_SOURCES = \ errorutil.cpp fileerror.cpp fileheader.cpp fsservices.cpp \ growheap.cpp hashtable.cpp haval.cpp msystem.cpp ntmbs.cpp \ objectpool.cpp refcountobj.cpp serializable.cpp serializer.cpp \ - serializerimpl.cpp serializerutil.cpp serstring.cpp \ + serializerimpl.cpp serializerutil.cpp serstring.cpp \ srefcountobj.cpp srefcounttbl.cpp stdcore.cpp stringutil.cpp \ timebomb.cpp timeconvert.cpp tw_signal.cpp twlimits.cpp twlocale.cpp \ unixexcept.cpp usernotify.cpp usernotifystdout.cpp utf8.cpp \ wchar16.cpp +libcore_a_HEADERS = archive.h charutil.h cmdlineparser.h codeconvert.h \ + core.h coreerrors.h corestrings.h crc32.h debug.h displayencoder.h \ + displayutil.h error.h errorbucket.h errorbucketimpl.h errorgeneral.h \ + errortable.h errorutil.h file.h fileerror.h fileheader.h fixedfilebuf.h \ + fsservices.h growheap.h hashtable.h haval.h md5.h msystem.h ntdbs.h \ + ntmbs.h objectpool.h package.h platform.h refcountobj.h resources.h \ + serializable.h serializer.h serializerimpl.h serializerutil.h serstring.h \ + sha.h srefcountobj.h srefcounttbl.h stdcore.h stringutil.h tasktimer.h \ + tchar.h timebomb.h timeconvert.h tw_signal.h twlimits.h twlocale.h \ + twstringslang.h typed.h types.h unixexcept.h unixfsservices.h upperbound.h \ + usernotify.h usernotifystdout.h userstring.h userstringmem.h utf8.h wchar16.h + libcore_a_LIBADD = @CORE_CRYPT_O@ libcore_a_DEPENDENCIES = @CORE_CRYPT_O@ diff --git a/src/core/Makefile.in b/src/core/Makefile.in index f0fe6a0..06f1276 100644 --- a/src/core/Makefile.in +++ b/src/core/Makefile.in @@ -14,6 +14,7 @@ @SET_MAKE@ + VPATH = @srcdir@ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ @@ -95,7 +96,8 @@ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +DIST_COMMON = $(srcdir)/Makefile.am $(libcore_a_HEADERS) \ + $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -162,6 +164,35 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(libcore_adir)" +HEADERS = $(libcore_a_HEADERS) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -298,6 +329,7 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign no-dependencies AM_CPPFLAGS = -I.. noinst_LIBRARIES = libcore.a +libcore_adir = . libcore_a_SOURCES = \ file_unix.cpp unixfsservices.cpp \ archive.cpp charutil.cpp \ @@ -307,12 +339,24 @@ libcore_a_SOURCES = \ errorutil.cpp fileerror.cpp fileheader.cpp fsservices.cpp \ growheap.cpp hashtable.cpp haval.cpp msystem.cpp ntmbs.cpp \ objectpool.cpp refcountobj.cpp serializable.cpp serializer.cpp \ - serializerimpl.cpp serializerutil.cpp serstring.cpp \ + serializerimpl.cpp serializerutil.cpp serstring.cpp \ srefcountobj.cpp srefcounttbl.cpp stdcore.cpp stringutil.cpp \ timebomb.cpp timeconvert.cpp tw_signal.cpp twlimits.cpp twlocale.cpp \ unixexcept.cpp usernotify.cpp usernotifystdout.cpp utf8.cpp \ wchar16.cpp +libcore_a_HEADERS = archive.h charutil.h cmdlineparser.h codeconvert.h \ + core.h coreerrors.h corestrings.h crc32.h debug.h displayencoder.h \ + displayutil.h error.h errorbucket.h errorbucketimpl.h errorgeneral.h \ + errortable.h errorutil.h file.h fileerror.h fileheader.h fixedfilebuf.h \ + fsservices.h growheap.h hashtable.h haval.h md5.h msystem.h ntdbs.h \ + ntmbs.h objectpool.h package.h platform.h refcountobj.h resources.h \ + serializable.h serializer.h serializerimpl.h serializerutil.h serstring.h \ + sha.h srefcountobj.h srefcounttbl.h stdcore.h stringutil.h tasktimer.h \ + tchar.h timebomb.h timeconvert.h tw_signal.h twlimits.h twlocale.h \ + twstringslang.h typed.h types.h unixexcept.h unixfsservices.h upperbound.h \ + usernotify.h usernotifystdout.h userstring.h userstringmem.h utf8.h wchar16.h + libcore_a_LIBADD = @CORE_CRYPT_O@ libcore_a_DEPENDENCIES = @CORE_CRYPT_O@ all: all-am @@ -368,6 +412,27 @@ distclean-compile: .cpp.obj: $(AM_V_CXX)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +install-libcore_aHEADERS: $(libcore_a_HEADERS) + @$(NORMAL_INSTALL) + @list='$(libcore_a_HEADERS)'; test -n "$(libcore_adir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libcore_adir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libcore_adir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libcore_adir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(libcore_adir)" || exit $$?; \ + done + +uninstall-libcore_aHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(libcore_a_HEADERS)'; test -n "$(libcore_adir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(libcore_adir)'; $(am__uninstall_files_from_dir) ID: $(am__tagged_files) $(am__define_uniq_tagged_files); mkid -fID $$unique @@ -453,8 +518,11 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(LIBRARIES) +all-am: Makefile $(LIBRARIES) $(HEADERS) installdirs: + for dir in "$(DESTDIR)$(libcore_adir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done install: install-am install-exec: install-exec-am install-data: install-data-am @@ -506,7 +574,7 @@ info: info-am info-am: -install-data-am: +install-data-am: install-libcore_aHEADERS install-dvi: install-dvi-am @@ -550,7 +618,7 @@ ps: ps-am ps-am: -uninstall-am: +uninstall-am: uninstall-libcore_aHEADERS .MAKE: install-am install-strip @@ -560,12 +628,13 @@ uninstall-am: dvi-am html html-am info info-am install install-am \ install-data install-data-am install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \ - uninstall-am + install-info install-info-am install-libcore_aHEADERS \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-libcore_aHEADERS .PRECIOUS: Makefile diff --git a/src/cryptlib/Makefile.am b/src/cryptlib/Makefile.am index 988f3e0..75e3e5c 100644 --- a/src/cryptlib/Makefile.am +++ b/src/cryptlib/Makefile.am @@ -5,12 +5,19 @@ LN=@LN@ DEFAULT_INCLUDES = $(D_INCLUDES) noinst_LIBRARIES = libcryptlib.a +libcryptlib_adir=l libcryptlib_a_SOURCES = \ algebra.cpp asn.cpp cryptlib.cpp des.cpp dessp.cpp elgamal.cpp \ eprecomp.cpp filters.cpp forkjoin.cpp integer.cpp iterhash.cpp misc.cpp \ nbtheory.cpp pch.cpp queue.cpp rng.cpp sha.cpp zbits.cpp zdeflate.cpp \ zinflate.cpp ztrees.cpp +libcryptlib_a_HEADERS = \ + algebra.h asn.h config.h cryptlib.h des.h elgamal.h eprecomp.h filters.h \ + forkjoin.h integer.h iterhash.h misc.h modarith.h nbtheory.h pch.h \ + queue.h rng.h sha.h smartptr.h words.h zbits.h zdeflate.h zinflate.h \ + ztrees.h + DEFS = @DEFS@ # This gets rid of the -I. so AM_CPPFLAGS must be more explicit CLEANFILES = ../../lib/libcryptlib.a diff --git a/src/cryptlib/Makefile.in b/src/cryptlib/Makefile.in index 7eb7520..e4a246b 100644 --- a/src/cryptlib/Makefile.in +++ b/src/cryptlib/Makefile.in @@ -14,6 +14,7 @@ @SET_MAKE@ + VPATH = @srcdir@ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ @@ -95,7 +96,8 @@ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +DIST_COMMON = $(srcdir)/Makefile.am $(libcryptlib_a_HEADERS) \ + $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -151,6 +153,35 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(libcryptlib_adir)" +HEADERS = $(libcryptlib_a_HEADERS) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -288,12 +319,19 @@ AUTOMAKE_OPTIONS = foreign no-dependencies AM_CPPFLAGS = -I.. -I../.. DEFAULT_INCLUDES = $(D_INCLUDES) noinst_LIBRARIES = libcryptlib.a +libcryptlib_adir = l libcryptlib_a_SOURCES = \ algebra.cpp asn.cpp cryptlib.cpp des.cpp dessp.cpp elgamal.cpp \ eprecomp.cpp filters.cpp forkjoin.cpp integer.cpp iterhash.cpp misc.cpp \ nbtheory.cpp pch.cpp queue.cpp rng.cpp sha.cpp zbits.cpp zdeflate.cpp \ zinflate.cpp ztrees.cpp +libcryptlib_a_HEADERS = \ + algebra.h asn.h config.h cryptlib.h des.h elgamal.h eprecomp.h filters.h \ + forkjoin.h integer.h iterhash.h misc.h modarith.h nbtheory.h pch.h \ + queue.h rng.h sha.h smartptr.h words.h zbits.h zdeflate.h zinflate.h \ + ztrees.h + CLEANFILES = ../../lib/libcryptlib.a all: all-am @@ -348,6 +386,27 @@ distclean-compile: .cpp.obj: $(AM_V_CXX)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +install-libcryptlib_aHEADERS: $(libcryptlib_a_HEADERS) + @$(NORMAL_INSTALL) + @list='$(libcryptlib_a_HEADERS)'; test -n "$(libcryptlib_adir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libcryptlib_adir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libcryptlib_adir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libcryptlib_adir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(libcryptlib_adir)" || exit $$?; \ + done + +uninstall-libcryptlib_aHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(libcryptlib_a_HEADERS)'; test -n "$(libcryptlib_adir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(libcryptlib_adir)'; $(am__uninstall_files_from_dir) ID: $(am__tagged_files) $(am__define_uniq_tagged_files); mkid -fID $$unique @@ -433,8 +492,11 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(LIBRARIES) +all-am: Makefile $(LIBRARIES) $(HEADERS) installdirs: + for dir in "$(DESTDIR)$(libcryptlib_adir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done install: install-am install-exec: install-exec-am install-data: install-data-am @@ -487,7 +549,7 @@ info: info-am info-am: -install-data-am: +install-data-am: install-libcryptlib_aHEADERS install-dvi: install-dvi-am @@ -531,7 +593,7 @@ ps: ps-am ps-am: -uninstall-am: +uninstall-am: uninstall-libcryptlib_aHEADERS .MAKE: install-am install-strip @@ -541,12 +603,13 @@ uninstall-am: dvi-am html html-am info info-am install install-am \ install-data install-data-am install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \ - uninstall-am + install-info install-info-am install-libcryptlib_aHEADERS \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-libcryptlib_aHEADERS .PRECIOUS: Makefile diff --git a/src/db/Makefile.am b/src/db/Makefile.am index ba7d678..d2a1d12 100644 --- a/src/db/Makefile.am +++ b/src/db/Makefile.am @@ -3,10 +3,15 @@ AUTOMAKE_OPTIONS = foreign no-dependencies AM_CPPFLAGS = -I.. noinst_LIBRARIES = libdb.a +libdb_adir=. libdb_a_SOURCES = \ blockfile.cpp blockrecordarray.cpp blockrecordfile.cpp \ db.cpp hierdatabase.cpp hierdbpath.cpp stddb.cpp +libdb_a_HEADERS = \ + block.h blockfile.h blockrecordarray.h blockrecordfile.h \ + db.h hierdatabase.h hierdbnode.h hierdbpath.h stddb.h + DEFS = @DEFS@ # This gets rid of the -I. so AM_CPPFLAGS must be more explicit all: $(noinst_LIBRARIES) diff --git a/src/db/Makefile.in b/src/db/Makefile.in index 0ec15e9..42d0917 100644 --- a/src/db/Makefile.in +++ b/src/db/Makefile.in @@ -14,6 +14,7 @@ @SET_MAKE@ + VPATH = @srcdir@ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ @@ -95,7 +96,8 @@ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +DIST_COMMON = $(srcdir)/Makefile.am $(libdb_a_HEADERS) \ + $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -148,6 +150,35 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(libdb_adir)" +HEADERS = $(libdb_a_HEADERS) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -284,10 +315,15 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign no-dependencies AM_CPPFLAGS = -I.. noinst_LIBRARIES = libdb.a +libdb_adir = . libdb_a_SOURCES = \ blockfile.cpp blockrecordarray.cpp blockrecordfile.cpp \ db.cpp hierdatabase.cpp hierdbpath.cpp stddb.cpp +libdb_a_HEADERS = \ + block.h blockfile.h blockrecordarray.h blockrecordfile.h \ + db.h hierdatabase.h hierdbnode.h hierdbpath.h stddb.h + all: all-am .SUFFIXES: @@ -341,6 +377,27 @@ distclean-compile: .cpp.obj: $(AM_V_CXX)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +install-libdb_aHEADERS: $(libdb_a_HEADERS) + @$(NORMAL_INSTALL) + @list='$(libdb_a_HEADERS)'; test -n "$(libdb_adir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libdb_adir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libdb_adir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libdb_adir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(libdb_adir)" || exit $$?; \ + done + +uninstall-libdb_aHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(libdb_a_HEADERS)'; test -n "$(libdb_adir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(libdb_adir)'; $(am__uninstall_files_from_dir) ID: $(am__tagged_files) $(am__define_uniq_tagged_files); mkid -fID $$unique @@ -426,8 +483,11 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(LIBRARIES) +all-am: Makefile $(LIBRARIES) $(HEADERS) installdirs: + for dir in "$(DESTDIR)$(libdb_adir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done install: install-am install-exec: install-exec-am install-data: install-data-am @@ -479,7 +539,7 @@ info: info-am info-am: -install-data-am: +install-data-am: install-libdb_aHEADERS install-dvi: install-dvi-am @@ -523,7 +583,7 @@ ps: ps-am ps-am: -uninstall-am: +uninstall-am: uninstall-libdb_aHEADERS .MAKE: install-am install-strip @@ -533,12 +593,13 @@ uninstall-am: dvi-am html html-am info info-am install install-am \ install-data install-data-am install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \ - uninstall-am + install-info install-info-am install-libdb_aHEADERS \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-libdb_aHEADERS .PRECIOUS: Makefile diff --git a/src/fco/Makefile.am b/src/fco/Makefile.am index e42fe2f..e3b6584 100644 --- a/src/fco/Makefile.am +++ b/src/fco/Makefile.am @@ -3,6 +3,7 @@ AUTOMAKE_OPTIONS = foreign no-dependencies AM_CPPFLAGS = -I.. noinst_LIBRARIES = libfco.a +libfco_adir=. libfco_a_SOURCES = \ fco.cpp fcocompare.cpp fcodatasourceiter.cpp \ fcodatasourceiterimpl.cpp fcoerrors.cpp fconame.cpp \ @@ -11,7 +12,20 @@ libfco_a_SOURCES = \ fcospecimpl.cpp fcospeclist.cpp fcospecutil.cpp fcostrings.cpp \ fcoundefprop.cpp genreinfo.cpp genrespeclist.cpp \ genreswitcher.cpp signature.cpp stdfco.cpp twfactory.cpp - + +libfco_a_HEADERS = \ + fco.h fcocompare.h fcodatasource.h fcodatasourceiter.h \ + fcodatasourceiterimpl.h fcoerrors.h fcogenre.h fconame.h \ + fconameinfo.h fconametbl.h fconametranslator.h fcoprop.h \ + fcopropcalc.h fcopropdisplayer.h fcopropimpl.h fcopropset.h \ + fcopropsetimpl.h fcopropvector.h fcosetimpl.h fcosetws.h \ + fcospec.h fcospecattr.h fcospechelper.h fcospecimpl.h \ + fcospeclist.h fcospecutil.h fcostrings.h fcoundefprop.h \ + fcovisitor.h genreinfo.h genrespeclist.h genreswitcher.h \ + iterproxy.h parsergenreutil.h propset.h signature.h \ + stdfco.h twfactory.h + + DEFS = @DEFS@ # This gets rid of the -I. so AM_CPPFLAGS must be more explicit all: $(noinst_LIBRARIES) diff --git a/src/fco/Makefile.in b/src/fco/Makefile.in index 1bb7fe5..7f768f4 100644 --- a/src/fco/Makefile.in +++ b/src/fco/Makefile.in @@ -14,6 +14,7 @@ @SET_MAKE@ + VPATH = @srcdir@ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ @@ -95,7 +96,8 @@ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +DIST_COMMON = $(srcdir)/Makefile.am $(libfco_a_HEADERS) \ + $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -156,6 +158,35 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(libfco_adir)" +HEADERS = $(libfco_a_HEADERS) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -292,6 +323,7 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign no-dependencies AM_CPPFLAGS = -I.. noinst_LIBRARIES = libfco.a +libfco_adir = . libfco_a_SOURCES = \ fco.cpp fcocompare.cpp fcodatasourceiter.cpp \ fcodatasourceiterimpl.cpp fcoerrors.cpp fconame.cpp \ @@ -301,6 +333,18 @@ libfco_a_SOURCES = \ fcoundefprop.cpp genreinfo.cpp genrespeclist.cpp \ genreswitcher.cpp signature.cpp stdfco.cpp twfactory.cpp +libfco_a_HEADERS = \ + fco.h fcocompare.h fcodatasource.h fcodatasourceiter.h \ + fcodatasourceiterimpl.h fcoerrors.h fcogenre.h fconame.h \ + fconameinfo.h fconametbl.h fconametranslator.h fcoprop.h \ + fcopropcalc.h fcopropdisplayer.h fcopropimpl.h fcopropset.h \ + fcopropsetimpl.h fcopropvector.h fcosetimpl.h fcosetws.h \ + fcospec.h fcospecattr.h fcospechelper.h fcospecimpl.h \ + fcospeclist.h fcospecutil.h fcostrings.h fcoundefprop.h \ + fcovisitor.h genreinfo.h genrespeclist.h genreswitcher.h \ + iterproxy.h parsergenreutil.h propset.h signature.h \ + stdfco.h twfactory.h + all: all-am .SUFFIXES: @@ -354,6 +398,27 @@ distclean-compile: .cpp.obj: $(AM_V_CXX)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +install-libfco_aHEADERS: $(libfco_a_HEADERS) + @$(NORMAL_INSTALL) + @list='$(libfco_a_HEADERS)'; test -n "$(libfco_adir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libfco_adir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libfco_adir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libfco_adir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(libfco_adir)" || exit $$?; \ + done + +uninstall-libfco_aHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(libfco_a_HEADERS)'; test -n "$(libfco_adir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(libfco_adir)'; $(am__uninstall_files_from_dir) ID: $(am__tagged_files) $(am__define_uniq_tagged_files); mkid -fID $$unique @@ -439,8 +504,11 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(LIBRARIES) +all-am: Makefile $(LIBRARIES) $(HEADERS) installdirs: + for dir in "$(DESTDIR)$(libfco_adir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done install: install-am install-exec: install-exec-am install-data: install-data-am @@ -492,7 +560,7 @@ info: info-am info-am: -install-data-am: +install-data-am: install-libfco_aHEADERS install-dvi: install-dvi-am @@ -536,7 +604,7 @@ ps: ps-am ps-am: -uninstall-am: +uninstall-am: uninstall-libfco_aHEADERS .MAKE: install-am install-strip @@ -546,12 +614,13 @@ uninstall-am: dvi-am html html-am info info-am install install-am \ install-data install-data-am install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \ - uninstall-am + install-info install-info-am install-libfco_aHEADERS \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-libfco_aHEADERS .PRECIOUS: Makefile diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am index da8b5d8..a2491dc 100644 --- a/src/fs/Makefile.am +++ b/src/fs/Makefile.am @@ -3,12 +3,19 @@ AUTOMAKE_OPTIONS = foreign no-dependencies AM_CPPFLAGS = -I.. noinst_LIBRARIES = libfs.a +libfs_adir=. libfs_a_SOURCES = \ fs.cpp fsdatasourceiter.cpp fserrors.cpp fsfactory.cpp \ fsnametranslator.cpp fsobject.cpp fsparserutil.cpp \ fspropcalc.cpp fspropdisplayer.cpp fspropset.cpp \ fsstrings.cpp fsvisitor.cpp stdfs.cpp +libfs_a_HEADERS = \ + fs.h fsdatasourceiter.h fserrors.h fsfactory.h \ + fsnametranslator.h fsobject.h fsparserutil.h \ + fspropcalc.h fspropdisplayer.h fspropset.h fsstrings.h \ + fsvisitor.h stdfs.h + DEFS = @DEFS@ # This gets rid of the -I. so AM_CPPFLAGS must be more explicit all: $(noinst_LIBRARIES) diff --git a/src/fs/Makefile.in b/src/fs/Makefile.in index b561ec6..8e9ad35 100644 --- a/src/fs/Makefile.in +++ b/src/fs/Makefile.in @@ -14,6 +14,7 @@ @SET_MAKE@ + VPATH = @srcdir@ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ @@ -95,7 +96,8 @@ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +DIST_COMMON = $(srcdir)/Makefile.am $(libfs_a_HEADERS) \ + $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -151,6 +153,35 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(libfs_adir)" +HEADERS = $(libfs_a_HEADERS) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -287,12 +318,19 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign no-dependencies AM_CPPFLAGS = -I.. noinst_LIBRARIES = libfs.a +libfs_adir = . libfs_a_SOURCES = \ fs.cpp fsdatasourceiter.cpp fserrors.cpp fsfactory.cpp \ fsnametranslator.cpp fsobject.cpp fsparserutil.cpp \ fspropcalc.cpp fspropdisplayer.cpp fspropset.cpp \ fsstrings.cpp fsvisitor.cpp stdfs.cpp +libfs_a_HEADERS = \ + fs.h fsdatasourceiter.h fserrors.h fsfactory.h \ + fsnametranslator.h fsobject.h fsparserutil.h \ + fspropcalc.h fspropdisplayer.h fspropset.h fsstrings.h \ + fsvisitor.h stdfs.h + all: all-am .SUFFIXES: @@ -346,6 +384,27 @@ distclean-compile: .cpp.obj: $(AM_V_CXX)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +install-libfs_aHEADERS: $(libfs_a_HEADERS) + @$(NORMAL_INSTALL) + @list='$(libfs_a_HEADERS)'; test -n "$(libfs_adir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libfs_adir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libfs_adir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libfs_adir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(libfs_adir)" || exit $$?; \ + done + +uninstall-libfs_aHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(libfs_a_HEADERS)'; test -n "$(libfs_adir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(libfs_adir)'; $(am__uninstall_files_from_dir) ID: $(am__tagged_files) $(am__define_uniq_tagged_files); mkid -fID $$unique @@ -431,8 +490,11 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(LIBRARIES) +all-am: Makefile $(LIBRARIES) $(HEADERS) installdirs: + for dir in "$(DESTDIR)$(libfs_adir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done install: install-am install-exec: install-exec-am install-data: install-data-am @@ -484,7 +546,7 @@ info: info-am info-am: -install-data-am: +install-data-am: install-libfs_aHEADERS install-dvi: install-dvi-am @@ -528,7 +590,7 @@ ps: ps-am ps-am: -uninstall-am: +uninstall-am: uninstall-libfs_aHEADERS .MAKE: install-am install-strip @@ -538,12 +600,13 @@ uninstall-am: dvi-am html html-am info info-am install install-am \ install-data install-data-am install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \ - uninstall-am + install-info install-info-am install-libfs_aHEADERS \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-libfs_aHEADERS .PRECIOUS: Makefile diff --git a/src/siggen/Makefile.am b/src/siggen/Makefile.am index ccf755a..ad0c500 100644 --- a/src/siggen/Makefile.am +++ b/src/siggen/Makefile.am @@ -7,10 +7,14 @@ LDFLAGS = @LDFLAGS@ -L../../lib LN_S = @LN@ sbin_PROGRAMS = siggen +siggendir=. siggen_SOURCES = \ siggen.cpp siggencmdline.cpp siggenmain.cpp \ siggenstrings.cpp stdsiggen.cpp +siggen_HEADERS = \ + resource.h siggen.h siggencmdline.h siggenstrings.h stdsiggen.h + DEFS = @DEFS@ # This gets rid of the -I. so AM_CPPFLAGS must be more explicit CLEANFILES = ../../bin/siggen diff --git a/src/siggen/Makefile.in b/src/siggen/Makefile.in index 98800c2..2f56b44 100644 --- a/src/siggen/Makefile.in +++ b/src/siggen/Makefile.in @@ -14,6 +14,7 @@ @SET_MAKE@ + VPATH = @srcdir@ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ @@ -96,12 +97,13 @@ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +DIST_COMMON = $(srcdir)/Makefile.am $(siggen_HEADERS) \ + $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -am__installdirs = "$(DESTDIR)$(sbindir)" +am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(siggendir)" PROGRAMS = $(sbin_PROGRAMS) am_siggen_OBJECTS = siggen.$(OBJEXT) siggencmdline.$(OBJEXT) \ siggenmain.$(OBJEXT) siggenstrings.$(OBJEXT) \ @@ -143,6 +145,34 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +HEADERS = $(siggen_HEADERS) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -279,10 +309,14 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign no-dependencies AM_INSTALL_PROGRAM_FLAGS = -m 755 AM_CPPFLAGS = -I.. +siggendir = . siggen_SOURCES = \ siggen.cpp siggencmdline.cpp siggenmain.cpp \ siggenstrings.cpp stdsiggen.cpp +siggen_HEADERS = \ + resource.h siggen.h siggencmdline.h siggenstrings.h stdsiggen.h + CLEANFILES = ../../bin/siggen all: all-am @@ -375,6 +409,27 @@ distclean-compile: .cpp.obj: $(AM_V_CXX)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +install-siggenHEADERS: $(siggen_HEADERS) + @$(NORMAL_INSTALL) + @list='$(siggen_HEADERS)'; test -n "$(siggendir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(siggendir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(siggendir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(siggendir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(siggendir)" || exit $$?; \ + done + +uninstall-siggenHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(siggen_HEADERS)'; test -n "$(siggendir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(siggendir)'; $(am__uninstall_files_from_dir) ID: $(am__tagged_files) $(am__define_uniq_tagged_files); mkid -fID $$unique @@ -460,9 +515,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(PROGRAMS) +all-am: Makefile $(PROGRAMS) $(HEADERS) installdirs: - for dir in "$(DESTDIR)$(sbindir)"; do \ + for dir in "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(siggendir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -517,7 +572,7 @@ info: info-am info-am: -install-data-am: +install-data-am: install-siggenHEADERS install-dvi: install-dvi-am @@ -561,7 +616,7 @@ ps: ps-am ps-am: -uninstall-am: uninstall-sbinPROGRAMS +uninstall-am: uninstall-sbinPROGRAMS uninstall-siggenHEADERS .MAKE: install-am install-strip @@ -573,10 +628,11 @@ uninstall-am: uninstall-sbinPROGRAMS install-exec install-exec-am install-html install-html-am \ install-info install-info-am install-man install-pdf \ install-pdf-am install-ps install-ps-am install-sbinPROGRAMS \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ - tags tags-am uninstall uninstall-am uninstall-sbinPROGRAMS + install-siggenHEADERS install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-sbinPROGRAMS uninstall-siggenHEADERS .PRECIOUS: Makefile diff --git a/src/tripwire/Makefile.am b/src/tripwire/Makefile.am index e5a058f..88244c6 100644 --- a/src/tripwire/Makefile.am +++ b/src/tripwire/Makefile.am @@ -7,12 +7,18 @@ LDFLAGS = @LDFLAGS@ -L../../lib LN_S = @LN@ sbin_PROGRAMS = tripwire +tripwiredir=. tripwire_SOURCES = \ generatedb.cpp integritycheck.cpp mailmessage.cpp pipedmailmessage.cpp \ policyupdate.cpp smtpmailmessage.cpp stdtripwire.cpp syslog_trip.cpp \ tripwire.cpp tripwireerrors.cpp tripwiremain.cpp tripwirestrings.cpp \ tripwireutil.cpp twcmdline.cpp twcmdlineutil.cpp updatedb.cpp +tripwire_HEADERS = \ + generatedb.h integritycheck.h mailmessage.h policyupdate.h resource.h \ + stdtripwire.h syslog_trip.h tripwire.h tripwireerrors.h tripwiremsg.h \ + tripwirestrings.h tripwireutil.h twcmdline.h twcmdlineutil.h updatedb.h + DEFS = @DEFS@ # This gets rid of the -I. so AM_CPPFLAGS must be more explicit CLEANFILES = ../../bin/tripwire ../../lib/libtripwire.a diff --git a/src/tripwire/Makefile.in b/src/tripwire/Makefile.in index 610f2e2..d224233 100644 --- a/src/tripwire/Makefile.in +++ b/src/tripwire/Makefile.in @@ -14,6 +14,7 @@ @SET_MAKE@ + VPATH = @srcdir@ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ @@ -96,12 +97,13 @@ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +DIST_COMMON = $(srcdir)/Makefile.am $(tripwire_HEADERS) \ + $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -am__installdirs = "$(DESTDIR)$(sbindir)" +am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(tripwiredir)" PROGRAMS = $(sbin_PROGRAMS) am_tripwire_OBJECTS = generatedb.$(OBJEXT) integritycheck.$(OBJEXT) \ mailmessage.$(OBJEXT) pipedmailmessage.$(OBJEXT) \ @@ -147,6 +149,34 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +HEADERS = $(tripwire_HEADERS) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -283,12 +313,18 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign no-dependencies AM_INSTALL_PROGRAM_FLAGS = -m 755 AM_CPPFLAGS = -I.. +tripwiredir = . tripwire_SOURCES = \ generatedb.cpp integritycheck.cpp mailmessage.cpp pipedmailmessage.cpp \ policyupdate.cpp smtpmailmessage.cpp stdtripwire.cpp syslog_trip.cpp \ tripwire.cpp tripwireerrors.cpp tripwiremain.cpp tripwirestrings.cpp \ tripwireutil.cpp twcmdline.cpp twcmdlineutil.cpp updatedb.cpp +tripwire_HEADERS = \ + generatedb.h integritycheck.h mailmessage.h policyupdate.h resource.h \ + stdtripwire.h syslog_trip.h tripwire.h tripwireerrors.h tripwiremsg.h \ + tripwirestrings.h tripwireutil.h twcmdline.h twcmdlineutil.h updatedb.h + CLEANFILES = ../../bin/tripwire ../../lib/libtripwire.a all: all-am @@ -381,6 +417,27 @@ distclean-compile: .cpp.obj: $(AM_V_CXX)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +install-tripwireHEADERS: $(tripwire_HEADERS) + @$(NORMAL_INSTALL) + @list='$(tripwire_HEADERS)'; test -n "$(tripwiredir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(tripwiredir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(tripwiredir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(tripwiredir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(tripwiredir)" || exit $$?; \ + done + +uninstall-tripwireHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(tripwire_HEADERS)'; test -n "$(tripwiredir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(tripwiredir)'; $(am__uninstall_files_from_dir) ID: $(am__tagged_files) $(am__define_uniq_tagged_files); mkid -fID $$unique @@ -466,9 +523,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(PROGRAMS) +all-am: Makefile $(PROGRAMS) $(HEADERS) installdirs: - for dir in "$(DESTDIR)$(sbindir)"; do \ + for dir in "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(tripwiredir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -523,7 +580,7 @@ info: info-am info-am: -install-data-am: +install-data-am: install-tripwireHEADERS install-dvi: install-dvi-am @@ -567,7 +624,7 @@ ps: ps-am ps-am: -uninstall-am: uninstall-sbinPROGRAMS +uninstall-am: uninstall-sbinPROGRAMS uninstall-tripwireHEADERS .MAKE: install-am install-strip @@ -579,10 +636,11 @@ uninstall-am: uninstall-sbinPROGRAMS install-exec install-exec-am install-html install-html-am \ install-info install-info-am install-man install-pdf \ install-pdf-am install-ps install-ps-am install-sbinPROGRAMS \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ - tags tags-am uninstall uninstall-am uninstall-sbinPROGRAMS + install-strip install-tripwireHEADERS installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-sbinPROGRAMS uninstall-tripwireHEADERS .PRECIOUS: Makefile diff --git a/src/tw/Makefile.am b/src/tw/Makefile.am index 47bbb89..275fd6c 100644 --- a/src/tw/Makefile.am +++ b/src/tw/Makefile.am @@ -3,6 +3,7 @@ AUTOMAKE_OPTIONS = foreign no-dependencies AM_CPPFLAGS = -I.. noinst_LIBRARIES = libtw.a +libtw_adir=. libtw_a_SOURCES = \ configfile.cpp dbdatasource.cpp dbdebug.cpp dbexplore.cpp \ fcodatabasefile.cpp fcodatabaseutil.cpp fcoreport.cpp \ @@ -11,6 +12,13 @@ libtw_a_SOURCES = \ textreportviewer.cpp tw.cpp twerrors.cpp twinit.cpp \ twstrings.cpp twutil.cpp +libtw_a_HEADERS = \ + configfile.h dbdatasource.h dbdebug.h dbexplore.h \ + fcodatabasefile.h fcodatabaseutil.h fcoreport.h \ + fcoreportutil.h filemanipulator.h headerinfo.h policyfile.h \ + stdtw.h systeminfo.h textdbviewer.h textreportviewer.h \ + tw.h twerrors.h twinit.h twstrings.h twutil.h + DEFS = @DEFS@ -DCONFIG_DIR=\"$(sysconfdir)\" all: $(noinst_LIBRARIES) diff --git a/src/tw/Makefile.in b/src/tw/Makefile.in index 9c8413a..51023f1 100644 --- a/src/tw/Makefile.in +++ b/src/tw/Makefile.in @@ -14,6 +14,7 @@ @SET_MAKE@ + VPATH = @srcdir@ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ @@ -95,7 +96,8 @@ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +DIST_COMMON = $(srcdir)/Makefile.am $(libtw_a_HEADERS) \ + $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -154,6 +156,35 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(libtw_adir)" +HEADERS = $(libtw_a_HEADERS) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -290,6 +321,7 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign no-dependencies AM_CPPFLAGS = -I.. noinst_LIBRARIES = libtw.a +libtw_adir = . libtw_a_SOURCES = \ configfile.cpp dbdatasource.cpp dbdebug.cpp dbexplore.cpp \ fcodatabasefile.cpp fcodatabaseutil.cpp fcoreport.cpp \ @@ -298,6 +330,13 @@ libtw_a_SOURCES = \ textreportviewer.cpp tw.cpp twerrors.cpp twinit.cpp \ twstrings.cpp twutil.cpp +libtw_a_HEADERS = \ + configfile.h dbdatasource.h dbdebug.h dbexplore.h \ + fcodatabasefile.h fcodatabaseutil.h fcoreport.h \ + fcoreportutil.h filemanipulator.h headerinfo.h policyfile.h \ + stdtw.h systeminfo.h textdbviewer.h textreportviewer.h \ + tw.h twerrors.h twinit.h twstrings.h twutil.h + all: all-am .SUFFIXES: @@ -351,6 +390,27 @@ distclean-compile: .cpp.obj: $(AM_V_CXX)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +install-libtw_aHEADERS: $(libtw_a_HEADERS) + @$(NORMAL_INSTALL) + @list='$(libtw_a_HEADERS)'; test -n "$(libtw_adir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libtw_adir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libtw_adir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libtw_adir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(libtw_adir)" || exit $$?; \ + done + +uninstall-libtw_aHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(libtw_a_HEADERS)'; test -n "$(libtw_adir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(libtw_adir)'; $(am__uninstall_files_from_dir) ID: $(am__tagged_files) $(am__define_uniq_tagged_files); mkid -fID $$unique @@ -436,8 +496,11 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(LIBRARIES) +all-am: Makefile $(LIBRARIES) $(HEADERS) installdirs: + for dir in "$(DESTDIR)$(libtw_adir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done install: install-am install-exec: install-exec-am install-data: install-data-am @@ -489,7 +552,7 @@ info: info-am info-am: -install-data-am: +install-data-am: install-libtw_aHEADERS install-dvi: install-dvi-am @@ -533,7 +596,7 @@ ps: ps-am ps-am: -uninstall-am: +uninstall-am: uninstall-libtw_aHEADERS .MAKE: install-am install-strip @@ -543,12 +606,13 @@ uninstall-am: dvi-am html html-am info info-am install install-am \ install-data install-data-am install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \ - uninstall-am + install-info install-info-am install-libtw_aHEADERS \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-libtw_aHEADERS .PRECIOUS: Makefile diff --git a/src/twadmin/Makefile.am b/src/twadmin/Makefile.am index ae2741d..c29e460 100644 --- a/src/twadmin/Makefile.am +++ b/src/twadmin/Makefile.am @@ -7,10 +7,15 @@ LDFLAGS = @LDFLAGS@ -L../../lib LN_S = @LN@ sbin_PROGRAMS = twadmin +twadmindir=. twadmin_SOURCES = \ keygeneration.cpp stdtwadmin.cpp twadmin.cpp twadmincl.cpp \ twadminerrors.cpp twadminmain.cpp twadminstrings.cpp +twadmin_HEADERS = \ + keygeneration.h resource.h stdtwadmin.h twadmin.h \ + twadmincl.h twadminerrors.h twadminstrings.h + DEFS = @DEFS@ # This gets rid of the -I. so AM_CPPFLAGS must be more explicit CLEANFILES = ../../bin/twadmin diff --git a/src/twadmin/Makefile.in b/src/twadmin/Makefile.in index 62c32d6..d7e3424 100644 --- a/src/twadmin/Makefile.in +++ b/src/twadmin/Makefile.in @@ -14,6 +14,7 @@ @SET_MAKE@ + VPATH = @srcdir@ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ @@ -96,12 +97,13 @@ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +DIST_COMMON = $(srcdir)/Makefile.am $(twadmin_HEADERS) \ + $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -am__installdirs = "$(DESTDIR)$(sbindir)" +am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(twadmindir)" PROGRAMS = $(sbin_PROGRAMS) am_twadmin_OBJECTS = keygeneration.$(OBJEXT) stdtwadmin.$(OBJEXT) \ twadmin.$(OBJEXT) twadmincl.$(OBJEXT) twadminerrors.$(OBJEXT) \ @@ -143,6 +145,34 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +HEADERS = $(twadmin_HEADERS) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -279,10 +309,15 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign no-dependencies AM_INSTALL_PROGRAM_FLAGS = -m 755 AM_CPPFLAGS = -I.. +twadmindir = . twadmin_SOURCES = \ keygeneration.cpp stdtwadmin.cpp twadmin.cpp twadmincl.cpp \ twadminerrors.cpp twadminmain.cpp twadminstrings.cpp +twadmin_HEADERS = \ + keygeneration.h resource.h stdtwadmin.h twadmin.h \ + twadmincl.h twadminerrors.h twadminstrings.h + CLEANFILES = ../../bin/twadmin all: all-am @@ -375,6 +410,27 @@ distclean-compile: .cpp.obj: $(AM_V_CXX)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +install-twadminHEADERS: $(twadmin_HEADERS) + @$(NORMAL_INSTALL) + @list='$(twadmin_HEADERS)'; test -n "$(twadmindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(twadmindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(twadmindir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(twadmindir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(twadmindir)" || exit $$?; \ + done + +uninstall-twadminHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(twadmin_HEADERS)'; test -n "$(twadmindir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(twadmindir)'; $(am__uninstall_files_from_dir) ID: $(am__tagged_files) $(am__define_uniq_tagged_files); mkid -fID $$unique @@ -460,9 +516,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(PROGRAMS) +all-am: Makefile $(PROGRAMS) $(HEADERS) installdirs: - for dir in "$(DESTDIR)$(sbindir)"; do \ + for dir in "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(twadmindir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -517,7 +573,7 @@ info: info-am info-am: -install-data-am: +install-data-am: install-twadminHEADERS install-dvi: install-dvi-am @@ -561,7 +617,7 @@ ps: ps-am ps-am: -uninstall-am: uninstall-sbinPROGRAMS +uninstall-am: uninstall-sbinPROGRAMS uninstall-twadminHEADERS .MAKE: install-am install-strip @@ -573,10 +629,11 @@ uninstall-am: uninstall-sbinPROGRAMS install-exec install-exec-am install-html install-html-am \ install-info install-info-am install-man install-pdf \ install-pdf-am install-ps install-ps-am install-sbinPROGRAMS \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ - tags tags-am uninstall uninstall-am uninstall-sbinPROGRAMS + install-strip install-twadminHEADERS installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-sbinPROGRAMS uninstall-twadminHEADERS .PRECIOUS: Makefile diff --git a/src/twcrypto/Makefile.am b/src/twcrypto/Makefile.am index 0eb030b..4a0e0f6 100644 --- a/src/twcrypto/Makefile.am +++ b/src/twcrypto/Makefile.am @@ -3,10 +3,15 @@ AUTOMAKE_OPTIONS = foreign no-dependencies AM_CPPFLAGS = -I.. noinst_LIBRARIES = libtwcrypto.a +libtwcrypto_adir=. libtwcrypto_a_SOURCES = \ bytequeue.cpp crypto.cpp cryptoarchive.cpp keyfile.cpp \ stdtwcrypto.cpp twcrypto.cpp twcryptoerrors.cpp +libtwcrypto_a_HEADERS = \ + bytequeue.h crypto.h cryptoarchive.h keyfile.h \ + stdtwcrypto.h twcrypto.h twcryptoerrors.h + DEFS = @DEFS@ # This gets rid of the -I. so AM_CPPFLAGS must be more explicit all: $(noinst_LIBRARIES) diff --git a/src/twcrypto/Makefile.in b/src/twcrypto/Makefile.in index 628d938..9bb04c8 100644 --- a/src/twcrypto/Makefile.in +++ b/src/twcrypto/Makefile.in @@ -14,6 +14,7 @@ @SET_MAKE@ + VPATH = @srcdir@ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ @@ -95,7 +96,8 @@ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +DIST_COMMON = $(srcdir)/Makefile.am $(libtwcrypto_a_HEADERS) \ + $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -149,6 +151,35 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(libtwcrypto_adir)" +HEADERS = $(libtwcrypto_a_HEADERS) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -285,10 +316,15 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign no-dependencies AM_CPPFLAGS = -I.. noinst_LIBRARIES = libtwcrypto.a +libtwcrypto_adir = . libtwcrypto_a_SOURCES = \ bytequeue.cpp crypto.cpp cryptoarchive.cpp keyfile.cpp \ stdtwcrypto.cpp twcrypto.cpp twcryptoerrors.cpp +libtwcrypto_a_HEADERS = \ + bytequeue.h crypto.h cryptoarchive.h keyfile.h \ + stdtwcrypto.h twcrypto.h twcryptoerrors.h + all: all-am .SUFFIXES: @@ -342,6 +378,27 @@ distclean-compile: .cpp.obj: $(AM_V_CXX)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +install-libtwcrypto_aHEADERS: $(libtwcrypto_a_HEADERS) + @$(NORMAL_INSTALL) + @list='$(libtwcrypto_a_HEADERS)'; test -n "$(libtwcrypto_adir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libtwcrypto_adir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libtwcrypto_adir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libtwcrypto_adir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(libtwcrypto_adir)" || exit $$?; \ + done + +uninstall-libtwcrypto_aHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(libtwcrypto_a_HEADERS)'; test -n "$(libtwcrypto_adir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(libtwcrypto_adir)'; $(am__uninstall_files_from_dir) ID: $(am__tagged_files) $(am__define_uniq_tagged_files); mkid -fID $$unique @@ -427,8 +484,11 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(LIBRARIES) +all-am: Makefile $(LIBRARIES) $(HEADERS) installdirs: + for dir in "$(DESTDIR)$(libtwcrypto_adir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done install: install-am install-exec: install-exec-am install-data: install-data-am @@ -480,7 +540,7 @@ info: info-am info-am: -install-data-am: +install-data-am: install-libtwcrypto_aHEADERS install-dvi: install-dvi-am @@ -524,7 +584,7 @@ ps: ps-am ps-am: -uninstall-am: +uninstall-am: uninstall-libtwcrypto_aHEADERS .MAKE: install-am install-strip @@ -534,12 +594,13 @@ uninstall-am: dvi-am html html-am info info-am install install-am \ install-data install-data-am install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \ - uninstall-am + install-info install-info-am install-libtwcrypto_aHEADERS \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-libtwcrypto_aHEADERS .PRECIOUS: Makefile diff --git a/src/twparser/Makefile.am b/src/twparser/Makefile.am index a3dfba8..4774f1a 100644 --- a/src/twparser/Makefile.am +++ b/src/twparser/Makefile.am @@ -3,11 +3,17 @@ AUTOMAKE_OPTIONS = foreign no-dependencies AM_CPPFLAGS = -I.. noinst_LIBRARIES = libtwparser.a +libtwparser_adir=. libtwparser_a_SOURCES = \ genreparseinfo.cpp parserhelper.cpp parserobjects.cpp \ policyparser.cpp stdtwparser.cpp twparser.cpp twparsererrors.cpp \ twparserstrings.cpp yylex.cpp yyparse.cpp +libtwparser_a_HEADERS = \ + genreparseinfo.h parserhelper.h parserobjects.h policyparser.h \ + stdtwparser.h twparser.h twparsererrors.h twparserstrings.h \ + yylex.h yyparse.h + DEFS = @DEFS@ # This gets rid of the -I. so AM_CPPFLAGS must be more explicit all: $(noinst_LIBRARIES) diff --git a/src/twparser/Makefile.in b/src/twparser/Makefile.in index 2f03569..93792a2 100644 --- a/src/twparser/Makefile.in +++ b/src/twparser/Makefile.in @@ -14,6 +14,7 @@ @SET_MAKE@ + VPATH = @srcdir@ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ @@ -95,7 +96,8 @@ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +DIST_COMMON = $(srcdir)/Makefile.am $(libtwparser_a_HEADERS) \ + $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -150,6 +152,35 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(libtwparser_adir)" +HEADERS = $(libtwparser_a_HEADERS) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -286,11 +317,17 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign no-dependencies AM_CPPFLAGS = -I.. noinst_LIBRARIES = libtwparser.a +libtwparser_adir = . libtwparser_a_SOURCES = \ genreparseinfo.cpp parserhelper.cpp parserobjects.cpp \ policyparser.cpp stdtwparser.cpp twparser.cpp twparsererrors.cpp \ twparserstrings.cpp yylex.cpp yyparse.cpp +libtwparser_a_HEADERS = \ + genreparseinfo.h parserhelper.h parserobjects.h policyparser.h \ + stdtwparser.h twparser.h twparsererrors.h twparserstrings.h \ + yylex.h yyparse.h + all: all-am .SUFFIXES: @@ -344,6 +381,27 @@ distclean-compile: .cpp.obj: $(AM_V_CXX)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +install-libtwparser_aHEADERS: $(libtwparser_a_HEADERS) + @$(NORMAL_INSTALL) + @list='$(libtwparser_a_HEADERS)'; test -n "$(libtwparser_adir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libtwparser_adir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libtwparser_adir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libtwparser_adir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(libtwparser_adir)" || exit $$?; \ + done + +uninstall-libtwparser_aHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(libtwparser_a_HEADERS)'; test -n "$(libtwparser_adir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(libtwparser_adir)'; $(am__uninstall_files_from_dir) ID: $(am__tagged_files) $(am__define_uniq_tagged_files); mkid -fID $$unique @@ -429,8 +487,11 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(LIBRARIES) +all-am: Makefile $(LIBRARIES) $(HEADERS) installdirs: + for dir in "$(DESTDIR)$(libtwparser_adir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done install: install-am install-exec: install-exec-am install-data: install-data-am @@ -482,7 +543,7 @@ info: info-am info-am: -install-data-am: +install-data-am: install-libtwparser_aHEADERS install-dvi: install-dvi-am @@ -526,7 +587,7 @@ ps: ps-am ps-am: -uninstall-am: +uninstall-am: uninstall-libtwparser_aHEADERS .MAKE: install-am install-strip @@ -536,12 +597,13 @@ uninstall-am: dvi-am html html-am info info-am install install-am \ install-data install-data-am install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \ - uninstall-am + install-info install-info-am install-libtwparser_aHEADERS \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-libtwparser_aHEADERS .PRECIOUS: Makefile diff --git a/src/twprint/Makefile.am b/src/twprint/Makefile.am index 1536747..621b958 100644 --- a/src/twprint/Makefile.am +++ b/src/twprint/Makefile.am @@ -7,10 +7,15 @@ LDFLAGS = @LDFLAGS@ -L../../lib LN_S = @LN@ sbin_PROGRAMS = twprint +twprintdir=. twprint_SOURCES = \ stdtwprint.cpp twprint.cpp twprintcmdline.cpp twprinterrors.cpp \ twprintmain.cpp twprintstrings.cpp +twprint_HEADERS = \ + resource.h stdtwprint.h twprint.h twprintcmdline.h \ + twprinterrors.h twprintstrings.h + DEFS = @DEFS@ # This gets rid of the -I. so AM_CPPFLAGS must be more explicit CLEANFILES = ../../bin/twprint diff --git a/src/twprint/Makefile.in b/src/twprint/Makefile.in index a33a51f..11c0f32 100644 --- a/src/twprint/Makefile.in +++ b/src/twprint/Makefile.in @@ -14,6 +14,7 @@ @SET_MAKE@ + VPATH = @srcdir@ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ @@ -96,12 +97,13 @@ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +DIST_COMMON = $(srcdir)/Makefile.am $(twprint_HEADERS) \ + $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -am__installdirs = "$(DESTDIR)$(sbindir)" +am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(twprintdir)" PROGRAMS = $(sbin_PROGRAMS) am_twprint_OBJECTS = stdtwprint.$(OBJEXT) twprint.$(OBJEXT) \ twprintcmdline.$(OBJEXT) twprinterrors.$(OBJEXT) \ @@ -143,6 +145,34 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +HEADERS = $(twprint_HEADERS) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -279,10 +309,15 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign no-dependencies AM_INSTALL_PROGRAM_FLAGS = -m 755 AM_CPPFLAGS = -I.. +twprintdir = . twprint_SOURCES = \ stdtwprint.cpp twprint.cpp twprintcmdline.cpp twprinterrors.cpp \ twprintmain.cpp twprintstrings.cpp +twprint_HEADERS = \ + resource.h stdtwprint.h twprint.h twprintcmdline.h \ + twprinterrors.h twprintstrings.h + CLEANFILES = ../../bin/twprint all: all-am @@ -375,6 +410,27 @@ distclean-compile: .cpp.obj: $(AM_V_CXX)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +install-twprintHEADERS: $(twprint_HEADERS) + @$(NORMAL_INSTALL) + @list='$(twprint_HEADERS)'; test -n "$(twprintdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(twprintdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(twprintdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(twprintdir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(twprintdir)" || exit $$?; \ + done + +uninstall-twprintHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(twprint_HEADERS)'; test -n "$(twprintdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(twprintdir)'; $(am__uninstall_files_from_dir) ID: $(am__tagged_files) $(am__define_uniq_tagged_files); mkid -fID $$unique @@ -460,9 +516,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(PROGRAMS) +all-am: Makefile $(PROGRAMS) $(HEADERS) installdirs: - for dir in "$(DESTDIR)$(sbindir)"; do \ + for dir in "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(twprintdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -517,7 +573,7 @@ info: info-am info-am: -install-data-am: +install-data-am: install-twprintHEADERS install-dvi: install-dvi-am @@ -561,7 +617,7 @@ ps: ps-am ps-am: -uninstall-am: uninstall-sbinPROGRAMS +uninstall-am: uninstall-sbinPROGRAMS uninstall-twprintHEADERS .MAKE: install-am install-strip @@ -573,10 +629,11 @@ uninstall-am: uninstall-sbinPROGRAMS install-exec install-exec-am install-html install-html-am \ install-info install-info-am install-man install-pdf \ install-pdf-am install-ps install-ps-am install-sbinPROGRAMS \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ - tags tags-am uninstall uninstall-am uninstall-sbinPROGRAMS + install-strip install-twprintHEADERS installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-sbinPROGRAMS uninstall-twprintHEADERS .PRECIOUS: Makefile diff --git a/src/twtest/Makefile.am b/src/twtest/Makefile.am index 816da75..c98f1d7 100644 --- a/src/twtest/Makefile.am +++ b/src/twtest/Makefile.am @@ -7,6 +7,9 @@ LDFLAGS = @LDFLAGS@ -L../../lib LN_S = @LN@ sbin_PROGRAMS = twtest + +twtestdir=. + twtest_SOURCES = \ archive_t.cpp \ blockfile_t.cpp \ @@ -76,6 +79,8 @@ unixfsservices_t.cpp \ usernotifystdout_t.cpp \ wchar16_t.cpp +twtest_HEADERS = stdtest.h stringutil_t.h test.h + DEFS = @DEFS@ # This gets rid of the -I. so AM_CPPFLAGS must be more explicit CLEANFILES = ../../bin/twtest diff --git a/src/twtest/Makefile.in b/src/twtest/Makefile.in index 25e0428..89ab5ec 100644 --- a/src/twtest/Makefile.in +++ b/src/twtest/Makefile.in @@ -14,6 +14,7 @@ @SET_MAKE@ + VPATH = @srcdir@ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ @@ -96,12 +97,13 @@ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +DIST_COMMON = $(srcdir)/Makefile.am $(twtest_HEADERS) \ + $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -am__installdirs = "$(DESTDIR)$(sbindir)" +am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(twtestdir)" PROGRAMS = $(sbin_PROGRAMS) am_twtest_OBJECTS = archive_t.$(OBJEXT) blockfile_t.$(OBJEXT) \ blockrecordarray_t.$(OBJEXT) charutil_t.$(OBJEXT) \ @@ -183,6 +185,34 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +HEADERS = $(twtest_HEADERS) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -319,6 +349,7 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign no-dependencies AM_INSTALL_PROGRAM_FLAGS = -m 755 AM_CPPFLAGS = -I.. +twtestdir = . twtest_SOURCES = \ archive_t.cpp \ blockfile_t.cpp \ @@ -388,6 +419,7 @@ unixfsservices_t.cpp \ usernotifystdout_t.cpp \ wchar16_t.cpp +twtest_HEADERS = stdtest.h stringutil_t.h test.h CLEANFILES = ../../bin/twtest all: all-am @@ -480,6 +512,27 @@ distclean-compile: .cpp.obj: $(AM_V_CXX)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +install-twtestHEADERS: $(twtest_HEADERS) + @$(NORMAL_INSTALL) + @list='$(twtest_HEADERS)'; test -n "$(twtestdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(twtestdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(twtestdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(twtestdir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(twtestdir)" || exit $$?; \ + done + +uninstall-twtestHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(twtest_HEADERS)'; test -n "$(twtestdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(twtestdir)'; $(am__uninstall_files_from_dir) ID: $(am__tagged_files) $(am__define_uniq_tagged_files); mkid -fID $$unique @@ -565,9 +618,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(PROGRAMS) +all-am: Makefile $(PROGRAMS) $(HEADERS) installdirs: - for dir in "$(DESTDIR)$(sbindir)"; do \ + for dir in "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(twtestdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -622,7 +675,7 @@ info: info-am info-am: -install-data-am: +install-data-am: install-twtestHEADERS install-dvi: install-dvi-am @@ -666,7 +719,7 @@ ps: ps-am ps-am: -uninstall-am: uninstall-sbinPROGRAMS +uninstall-am: uninstall-sbinPROGRAMS uninstall-twtestHEADERS .MAKE: install-am install-strip @@ -678,10 +731,11 @@ uninstall-am: uninstall-sbinPROGRAMS install-exec install-exec-am install-html install-html-am \ install-info install-info-am install-man install-pdf \ install-pdf-am install-ps install-ps-am install-sbinPROGRAMS \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ - tags tags-am uninstall uninstall-am uninstall-sbinPROGRAMS + install-strip install-twtestHEADERS installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-sbinPROGRAMS uninstall-twtestHEADERS .PRECIOUS: Makefile diff --git a/src/core/stringutil_t.h b/src/twtest/stringutil_t.h similarity index 99% rename from src/core/stringutil_t.h rename to src/twtest/stringutil_t.h index 64aefca..12a5bdf 100644 --- a/src/core/stringutil_t.h +++ b/src/twtest/stringutil_t.h @@ -41,10 +41,10 @@ #ifndef __STRINGUTIL_T_H #define __STRINGUTIL_T_H -#include "ntmbs.h" +#include "core/ntmbs.h" #if USING_NTDBS_STUFF -#include "ntdbs.h" +#include "core/ntdbs.h" #endif // USING_NTDBS_STUFF //- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/twtest/test.cpp b/src/twtest/test.cpp index 07023ce..c77e7ff 100644 --- a/src/twtest/test.cpp +++ b/src/twtest/test.cpp @@ -146,7 +146,7 @@ void TestFileUtil(); void TestFCONameTranslator(); void TestCodeConverter(); /// This is easier than all the (cpp) files and declarations -#include "core/stringutil_t.h" +#include "stringutil_t.h" void Usage() { diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 00e4bcb..5c3fc2c 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -3,10 +3,14 @@ AUTOMAKE_OPTIONS = foreign no-dependencies AM_CPPFLAGS = -I.. noinst_LIBRARIES = libutil.a +libutil_adir = . libutil_a_SOURCES = \ fileutil.cpp stdutil.cpp stringencoder.cpp \ util.cpp utilerrors.cpp utilstrings.cpp +libutil_a_HEADERS = fileutil.h miscutil.h stdutil.h \ + stringencoder.h util.h utilerrors.h utilstrings.h + DEFS = @DEFS@ # This gets rid of the -I. so AM_CPPFLAGS must be more explicit all: $(noinst_LIBRARIES) diff --git a/src/util/Makefile.in b/src/util/Makefile.in index 9b3e8cc..ad2c19d 100644 --- a/src/util/Makefile.in +++ b/src/util/Makefile.in @@ -14,6 +14,7 @@ @SET_MAKE@ + VPATH = @srcdir@ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ @@ -95,7 +96,8 @@ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +DIST_COMMON = $(srcdir)/Makefile.am $(libutil_a_HEADERS) \ + $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -148,6 +150,35 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(libutil_adir)" +HEADERS = $(libutil_a_HEADERS) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -284,10 +315,14 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign no-dependencies AM_CPPFLAGS = -I.. noinst_LIBRARIES = libutil.a +libutil_adir = . libutil_a_SOURCES = \ fileutil.cpp stdutil.cpp stringencoder.cpp \ util.cpp utilerrors.cpp utilstrings.cpp +libutil_a_HEADERS = fileutil.h miscutil.h stdutil.h \ + stringencoder.h util.h utilerrors.h utilstrings.h + all: all-am .SUFFIXES: @@ -341,6 +376,27 @@ distclean-compile: .cpp.obj: $(AM_V_CXX)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +install-libutil_aHEADERS: $(libutil_a_HEADERS) + @$(NORMAL_INSTALL) + @list='$(libutil_a_HEADERS)'; test -n "$(libutil_adir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libutil_adir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libutil_adir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libutil_adir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(libutil_adir)" || exit $$?; \ + done + +uninstall-libutil_aHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(libutil_a_HEADERS)'; test -n "$(libutil_adir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(libutil_adir)'; $(am__uninstall_files_from_dir) ID: $(am__tagged_files) $(am__define_uniq_tagged_files); mkid -fID $$unique @@ -426,8 +482,11 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(LIBRARIES) +all-am: Makefile $(LIBRARIES) $(HEADERS) installdirs: + for dir in "$(DESTDIR)$(libutil_adir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done install: install-am install-exec: install-exec-am install-data: install-data-am @@ -479,7 +538,7 @@ info: info-am info-am: -install-data-am: +install-data-am: install-libutil_aHEADERS install-dvi: install-dvi-am @@ -523,7 +582,7 @@ ps: ps-am ps-am: -uninstall-am: +uninstall-am: uninstall-libutil_aHEADERS .MAKE: install-am install-strip @@ -533,12 +592,13 @@ uninstall-am: dvi-am html html-am info info-am install install-am \ install-data install-data-am install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \ - uninstall-am + install-info install-info-am install-libutil_aHEADERS \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-libutil_aHEADERS .PRECIOUS: Makefile