From 0d0d30418e299601d2d5dfd43690759a8804005b Mon Sep 17 00:00:00 2001 From: Sam Hartman Date: Wed, 7 Dec 2011 14:17:40 -0500 Subject: [PATCH] autoreconf --- Makefile.in | 16 ++--- config.h.in | 15 +++++ configure | 184 +++++++++++++++++++++++++++++++++++++++++++++++---- saml/Makefile.in | 44 +++++++----- samltest/Makefile.in | 24 ++++--- 5 files changed, 232 insertions(+), 51 deletions(-) diff --git a/Makefile.in b/Makefile.in index ca413b5..f782db9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -65,9 +65,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/Portfile.in \ - $(srcdir)/config.h.in $(srcdir)/doxygen.am \ - $(srcdir)/opensaml.spec.in $(srcdir)/pkginfo.in \ + $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(srcdir)/doxygen.am $(srcdir)/opensaml.spec.in \ $(top_srcdir)/configure build-aux/config.guess \ build-aux/config.sub build-aux/depcomp build-aux/install-sh \ build-aux/ltmain.sh build-aux/missing @@ -86,7 +85,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = opensaml.spec pkginfo Portfile +CONFIG_CLEAN_FILES = opensaml.spec CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = @@ -354,13 +353,12 @@ DISTCLEANFILES = \ SUBDIRS = doc schemas saml samltest samlsign pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = @PACKAGE_NAME@.pc -GENFILES = @PACKAGE_NAME@.spec pkginfo Portfile +GENFILES = @PACKAGE_NAME@.spec EXTRA_DIST = $(DX_CONFIG) \ cpp-opensaml2.sln \ config_win32.h \ $(GENFILES) \ - $(GENFILES:%=%.in) \ - postinstall + $(GENFILES:%=%.in) all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -419,10 +417,6 @@ distclean-hdr: -rm -f config.h stamp-h1 opensaml.spec: $(top_builddir)/config.status $(srcdir)/opensaml.spec.in cd $(top_builddir) && $(SHELL) ./config.status $@ -pkginfo: $(top_builddir)/config.status $(srcdir)/pkginfo.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -Portfile: $(top_builddir)/config.status $(srcdir)/Portfile.in - cd $(top_builddir) && $(SHELL) ./config.status $@ mostlyclean-libtool: -rm -f *.lo diff --git a/config.h.in b/config.h.in index 8328d09..ce12478 100644 --- a/config.h.in +++ b/config.h.in @@ -1,5 +1,9 @@ /* config.h.in. Generated from configure.ac by autoheader. */ +/* Define to 1 if you have the header file, and it defines `DIR'. + */ +#undef HAVE_DIRENT_H + /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H @@ -15,6 +19,9 @@ /* define if the compiler implements namespaces */ #undef HAVE_NAMESPACES +/* Define to 1 if you have the header file, and it defines `DIR'. */ +#undef HAVE_NDIR_H + /* Define if you have POSIX threads libraries and header files. */ #undef HAVE_PTHREAD @@ -39,6 +46,14 @@ /* Define to 1 if you have the `strstr' function. */ #undef HAVE_STRSTR +/* Define to 1 if you have the header file, and it defines `DIR'. + */ +#undef HAVE_SYS_DIR_H + +/* Define to 1 if you have the header file, and it defines `DIR'. + */ +#undef HAVE_SYS_NDIR_H + /* Define to 1 if you have the header file. */ #undef HAVE_SYS_STAT_H diff --git a/configure b/configure index 779a4fe..4366012 100755 --- a/configure +++ b/configure @@ -2,7 +2,7 @@ # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.67 for opensaml 2.5. # -# Report bugs to . +# Report bugs to . # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -239,7 +239,7 @@ fi $as_echo "$0: be upgraded to zsh 4.3.4 or later." else $as_echo "$0: Please tell bug-autoconf@gnu.org and -$0: https://bugs.internet2.edu/ about your system, +$0: https://issues.shibboleth.net/ about your system, $0: including any error possibly output before this $0: message. Then install a modern shell, or manually run $0: the script under such a shell if you do have one." @@ -564,7 +564,7 @@ PACKAGE_NAME='opensaml' PACKAGE_TARNAME='opensaml' PACKAGE_VERSION='2.5' PACKAGE_STRING='opensaml 2.5' -PACKAGE_BUGREPORT='https://bugs.internet2.edu/' +PACKAGE_BUGREPORT='https://issues.shibboleth.net/' PACKAGE_URL='' ac_unique_file="saml" @@ -1502,7 +1502,7 @@ Some influential environment variables: Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to . +Report bugs to . _ACEOF ac_status=$? fi @@ -2263,9 +2263,9 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( $as_echo "## ------------------------------------------ ## -## Report this to https://bugs.internet2.edu/ ## -## ------------------------------------------ ##" +( $as_echo "## --------------------------------------------- ## +## Report this to https://issues.shibboleth.net/ ## +## --------------------------------------------- ##" ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -2354,9 +2354,9 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( $as_echo "## ------------------------------------------ ## -## Report this to https://bugs.internet2.edu/ ## -## ------------------------------------------ ##" +( $as_echo "## --------------------------------------------- ## +## Report this to https://issues.shibboleth.net/ ## +## --------------------------------------------- ##" ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -13690,7 +13690,7 @@ fi ac_config_headers="$ac_config_headers config.h" -ac_config_files="$ac_config_files opensaml.spec pkginfo Portfile" +ac_config_files="$ac_config_files opensaml.spec" ac_config_files="$ac_config_files Makefile saml/Makefile samltest/Makefile samlsign/Makefile schemas/Makefile doc/Makefile" @@ -17870,6 +17870,164 @@ _ACEOF fi +ac_header_dirent=no +for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do + as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5 +$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; } +if eval "test \"\${$as_ac_Header+set}\"" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include <$ac_hdr> + +int +main () +{ +if ((DIR *) 0) +return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$as_ac_Header=yes" +else + eval "$as_ac_Header=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$as_ac_Header + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 +_ACEOF + +ac_header_dirent=$ac_hdr; break +fi + +done +# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. +if test $ac_header_dirent = dirent.h; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 +$as_echo_n "checking for library containing opendir... " >&6; } +if test "${ac_cv_search_opendir+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char opendir (); +int +main () +{ +return opendir (); + ; + return 0; +} +_ACEOF +for ac_lib in '' dir; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_opendir=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if test "${ac_cv_search_opendir+set}" = set; then : + break +fi +done +if test "${ac_cv_search_opendir+set}" = set; then : + +else + ac_cv_search_opendir=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5 +$as_echo "$ac_cv_search_opendir" >&6; } +ac_res=$ac_cv_search_opendir +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +fi + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 +$as_echo_n "checking for library containing opendir... " >&6; } +if test "${ac_cv_search_opendir+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char opendir (); +int +main () +{ +return opendir (); + ; + return 0; +} +_ACEOF +for ac_lib in '' x; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_opendir=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if test "${ac_cv_search_opendir+set}" = set; then : + break +fi +done +if test "${ac_cv_search_opendir+set}" = set; then : + +else + ac_cv_search_opendir=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5 +$as_echo "$ac_cv_search_opendir" >&6; } +ac_res=$ac_cv_search_opendir +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +fi + +fi + # Checks for library functions. for ac_func in strchr strdup strstr @@ -19807,7 +19965,7 @@ $config_headers Configuration commands: $config_commands -Report bugs to ." +Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 @@ -20345,8 +20503,6 @@ do "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; "opensaml.spec") CONFIG_FILES="$CONFIG_FILES opensaml.spec" ;; - "pkginfo") CONFIG_FILES="$CONFIG_FILES pkginfo" ;; - "Portfile") CONFIG_FILES="$CONFIG_FILES Portfile" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "saml/Makefile") CONFIG_FILES="$CONFIG_FILES saml/Makefile" ;; "samltest/Makefile") CONFIG_FILES="$CONFIG_FILES samltest/Makefile" ;; diff --git a/saml/Makefile.in b/saml/Makefile.in index 3d7492f..2e57f55 100644 --- a/saml/Makefile.in +++ b/saml/Makefile.in @@ -109,23 +109,24 @@ am_libsaml_la_OBJECTS = SAMLConfig.lo version.lo ArtifactMap.lo \ Protocols20SchemaValidators.lo AbstractMetadataProvider.lo \ BlacklistMetadataFilter.lo ChainingMetadataProvider.lo \ DiscoverableMetadataProvider.lo DynamicMetadataProvider.lo \ - EntityRoleMetadataFilter.lo MetadataCredentialContext.lo \ - MetadataCredentialCriteria.lo MetadataImpl.lo \ - MetadataProvider.lo MetadataSchemaValidators.lo \ - NullMetadataProvider.lo ObservableMetadataProvider.lo \ - SignatureMetadataFilter.lo RequireValidUntilMetadataFilter.lo \ - WhitelistMetadataFilter.lo XMLMetadataProvider.lo \ - SAML2Artifact.lo SAML2ArtifactType0004.lo \ - SAML2ArtifactDecoder.lo SAML2ArtifactEncoder.lo \ - SAML2ECPDecoder.lo SAML2ECPEncoder.lo SAML2MessageDecoder.lo \ - SAML2POSTDecoder.lo SAML2POSTEncoder.lo SAML2Redirect.lo \ - SAML2RedirectDecoder.lo SAML2RedirectEncoder.lo \ - SAML2SOAPDecoder.lo SAML2SOAPEncoder.lo SAML2SOAPClient.lo \ - Assertion20Validator.lo BrowserSSOProfile20Validator.lo \ - BearerConfirmationRule.lo DelegationRestrictionRule.lo \ - SAML2AssertionPolicy.lo EncryptedKeyResolver.lo \ - ContentReference.lo SignatureProfileValidator.lo \ - CommonDomainCookie.lo SAMLConstants.lo + EntityRoleMetadataFilter.lo FolderMetadataProvider.lo \ + MetadataCredentialContext.lo MetadataCredentialCriteria.lo \ + MetadataImpl.lo MetadataProvider.lo \ + MetadataSchemaValidators.lo NullMetadataProvider.lo \ + ObservableMetadataProvider.lo SignatureMetadataFilter.lo \ + RequireValidUntilMetadataFilter.lo WhitelistMetadataFilter.lo \ + XMLMetadataProvider.lo SAML2Artifact.lo \ + SAML2ArtifactType0004.lo SAML2ArtifactDecoder.lo \ + SAML2ArtifactEncoder.lo SAML2ECPDecoder.lo SAML2ECPEncoder.lo \ + SAML2MessageDecoder.lo SAML2POSTDecoder.lo SAML2POSTEncoder.lo \ + SAML2Redirect.lo SAML2RedirectDecoder.lo \ + SAML2RedirectEncoder.lo SAML2SOAPDecoder.lo \ + SAML2SOAPEncoder.lo SAML2SOAPClient.lo Assertion20Validator.lo \ + BrowserSSOProfile20Validator.lo BearerConfirmationRule.lo \ + DelegationRestrictionRule.lo SAML2AssertionPolicy.lo \ + EncryptedKeyResolver.lo ContentReference.lo \ + SignatureProfileValidator.lo CommonDomainCookie.lo \ + SAMLConstants.lo libsaml_la_OBJECTS = $(am_libsaml_la_OBJECTS) libsaml_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ @@ -443,6 +444,7 @@ libsaml_la_SOURCES = \ saml2/metadata/impl/DiscoverableMetadataProvider.cpp \ saml2/metadata/impl/DynamicMetadataProvider.cpp \ saml2/metadata/impl/EntityRoleMetadataFilter.cpp \ + saml2/metadata/impl/FolderMetadataProvider.cpp \ saml2/metadata/impl/MetadataCredentialContext.cpp \ saml2/metadata/impl/MetadataCredentialCriteria.cpp \ saml2/metadata/impl/MetadataImpl.cpp \ @@ -583,6 +585,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DynamicMetadataProvider.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/EncryptedKeyResolver.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/EntityRoleMetadataFilter.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FolderMetadataProvider.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IgnoreRule.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MessageDecoder.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MessageEncoder.Plo@am__quote@ @@ -955,6 +958,13 @@ EntityRoleMetadataFilter.lo: saml2/metadata/impl/EntityRoleMetadataFilter.cpp @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o EntityRoleMetadataFilter.lo `test -f 'saml2/metadata/impl/EntityRoleMetadataFilter.cpp' || echo '$(srcdir)/'`saml2/metadata/impl/EntityRoleMetadataFilter.cpp +FolderMetadataProvider.lo: saml2/metadata/impl/FolderMetadataProvider.cpp +@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT FolderMetadataProvider.lo -MD -MP -MF $(DEPDIR)/FolderMetadataProvider.Tpo -c -o FolderMetadataProvider.lo `test -f 'saml2/metadata/impl/FolderMetadataProvider.cpp' || echo '$(srcdir)/'`saml2/metadata/impl/FolderMetadataProvider.cpp +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/FolderMetadataProvider.Tpo $(DEPDIR)/FolderMetadataProvider.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='saml2/metadata/impl/FolderMetadataProvider.cpp' object='FolderMetadataProvider.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o FolderMetadataProvider.lo `test -f 'saml2/metadata/impl/FolderMetadataProvider.cpp' || echo '$(srcdir)/'`saml2/metadata/impl/FolderMetadataProvider.cpp + MetadataCredentialContext.lo: saml2/metadata/impl/MetadataCredentialContext.cpp @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT MetadataCredentialContext.lo -MD -MP -MF $(DEPDIR)/MetadataCredentialContext.Tpo -c -o MetadataCredentialContext.lo `test -f 'saml2/metadata/impl/MetadataCredentialContext.cpp' || echo '$(srcdir)/'`saml2/metadata/impl/MetadataCredentialContext.cpp @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/MetadataCredentialContext.Tpo $(DEPDIR)/MetadataCredentialContext.Plo diff --git a/samltest/Makefile.in b/samltest/Makefile.in index c0a8813..c453df0 100644 --- a/samltest/Makefile.in +++ b/samltest/Makefile.in @@ -414,15 +414,18 @@ samltest_h = \ saml2/profile/SAML2PolicyTest.h noinst_HEADERS = \ - binding.h \ + binding.h \ internal.h \ - signature/SAMLSignatureTestBase.h + signature/SAMLSignatureTestBase.h \ + $(samltest_h) nodist_samltest_SOURCES = $(samltest_h:.h=.cpp) -CLEANFILES = $(nodist_samltest_SOURCES) +@BUILD_UNITTEST_TRUE@BUILT_SOURCES = $(nodist_samltest_SOURCES) +@BUILD_UNITTEST_TRUE@CLEANFILES = $(nodist_samltest_SOURCES) samltest_LDADD = $(top_builddir)/saml/libsaml.la -EXTRA_DIST = samltest.vcxproj samltest.vcxproj.filters $(samltest_h) data -all: all-am +EXTRA_DIST = samltest.vcxproj samltest.vcxproj.filters data +all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj @@ -1940,13 +1943,15 @@ distdir: $(DISTFILES) fi; \ done check-am: all-am -check: check-am +check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(PROGRAMS) $(HEADERS) installdirs: for dir in "$(DESTDIR)$(bindir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done -install: install-am +install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am install-exec: install-exec-am install-data: install-data-am uninstall: uninstall-am @@ -1972,6 +1977,7 @@ distclean-generic: 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 "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) clean: clean-am clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am @@ -2042,7 +2048,7 @@ ps-am: uninstall-am: uninstall-binPROGRAMS -.MAKE: install-am install-strip +.MAKE: all check install install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ clean-generic clean-libtool ctags distclean distclean-compile \ @@ -2060,7 +2066,7 @@ uninstall-am: uninstall-binPROGRAMS do-cxxtestgen: - if test $(HFILE) = "samltest.h"; then \ + if test "$(CPPFILE)" = "samltest.cpp"; then \ $(CXXTEST) --error-printer --have-eh --have-std --abort-on-fail -o $(CPPFILE) $(HFILE); \ else \ $(CXXTEST) --part --have-eh --have-std --abort-on-fail -o $(CPPFILE) $(HFILE); \ -- 2.1.4