From c3ccf5e3e6737f81863b085289fd830e732b41f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 20 Oct 2014 18:43:38 +0200 Subject: Imported Upstream version 0.8.1 --- Makefile.in | 63 +++++++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 45 insertions(+), 18 deletions(-) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index bea8b9d..f0fec0f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -61,10 +61,11 @@ bin_PROGRAMS = uriparse$(EXEEXT) subdir = . DIST_COMMON = $(am__configure_deps) $(pkginclude_HEADERS) \ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/liburiparser.pc.in $(top_srcdir)/configure AUTHORS \ - COPYING ChangeLog THANKS build-aux/config.guess \ - build-aux/config.sub build-aux/depcomp build-aux/install-sh \ - build-aux/ltmain.sh build-aux/missing config.guess + $(srcdir)/liburiparser.pc.in $(top_srcdir)/configure \ + $(top_srcdir)/test/config.h.in AUTHORS COPYING ChangeLog \ + THANKS build-aux/config.guess build-aux/config.sub \ + build-aux/depcomp build-aux/install-sh build-aux/ltmain.sh \ + build-aux/missing config.guess ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ @@ -75,6 +76,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/test/config.h CONFIG_CLEAN_FILES = liburiparser.pc CONFIG_CLEAN_VPATH_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; @@ -120,9 +122,11 @@ liburiparser_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(liburiparser_la_LDFLAGS) $(LDFLAGS) -o $@ PROGRAMS = $(bin_PROGRAMS) am__test_uriparser_test_SOURCES_DIST = test/FourSuite.cpp \ - test/FourSuite.h test/test.cpp + test/FourSuite.h test/VersionSuite.cpp test/VersionSuite.h \ + test/test.cpp @URI_TEST_ENABLED_TRUE@am_test_uriparser_test_OBJECTS = \ @URI_TEST_ENABLED_TRUE@ test/FourSuite.$(OBJEXT) \ +@URI_TEST_ENABLED_TRUE@ test/VersionSuite.$(OBJEXT) \ @URI_TEST_ENABLED_TRUE@ test/test.$(OBJEXT) test_uriparser_test_OBJECTS = $(am_test_uriparser_test_OBJECTS) @URI_TEST_ENABLED_TRUE@test_uriparser_test_DEPENDENCIES = \ @@ -135,7 +139,7 @@ uriparse_OBJECTS = $(am_uriparse_OBJECTS) uriparse_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(uriparse_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/test depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f @@ -290,6 +294,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ QHG_LOCATION = @QHG_LOCATION@ RANLIB = @RANLIB@ SED = @SED@ @@ -368,7 +374,7 @@ pkginclude_HEADERS = \ include/uriparser/UriDefsUnicode.h \ include/uriparser/UriIp4.h -liburiparser_la_LDFLAGS = -version-info 1:16:0 $(am__append_1) +liburiparser_la_LDFLAGS = -version-info 1:17:0 $(am__append_1) liburiparser_la_SOURCES = \ src/UriCommon.c \ src/UriCommon.h \ @@ -395,6 +401,8 @@ liburiparser_la_SOURCES = \ @URI_TEST_ENABLED_TRUE@test_uriparser_test_SOURCES = \ @URI_TEST_ENABLED_TRUE@ test/FourSuite.cpp \ @URI_TEST_ENABLED_TRUE@ test/FourSuite.h \ +@URI_TEST_ENABLED_TRUE@ test/VersionSuite.cpp \ +@URI_TEST_ENABLED_TRUE@ test/VersionSuite.h \ @URI_TEST_ENABLED_TRUE@ test/test.cpp EXTRA_DIST = \ @@ -456,6 +464,21 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) $(am__aclocal_m4_deps): + +test/config.h: test/stamp-h1 + @if test ! -f $@; then rm -f test/stamp-h1; else :; fi + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) test/stamp-h1; else :; fi + +test/stamp-h1: $(top_srcdir)/test/config.h.in $(top_builddir)/config.status + @rm -f test/stamp-h1 + cd $(top_builddir) && $(SHELL) ./config.status test/config.h +$(top_srcdir)/test/config.h.in: $(am__configure_deps) + ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) + rm -f test/stamp-h1 + touch $@ + +distclean-hdr: + -rm -f test/config.h test/stamp-h1 liburiparser.pc: $(top_builddir)/config.status $(srcdir)/liburiparser.pc.in cd $(top_builddir) && $(SHELL) ./config.status $@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) @@ -576,6 +599,8 @@ test/$(DEPDIR)/$(am__dirstamp): @: > test/$(DEPDIR)/$(am__dirstamp) test/FourSuite.$(OBJEXT): test/$(am__dirstamp) \ test/$(DEPDIR)/$(am__dirstamp) +test/VersionSuite.$(OBJEXT): test/$(am__dirstamp) \ + test/$(DEPDIR)/$(am__dirstamp) test/test.$(OBJEXT): test/$(am__dirstamp) \ test/$(DEPDIR)/$(am__dirstamp) test/uriparser_test$(EXEEXT): $(test_uriparser_test_OBJECTS) $(test_uriparser_test_DEPENDENCIES) $(EXTRA_test_uriparser_test_DEPENDENCIES) test/$(am__dirstamp) @@ -624,6 +649,7 @@ mostlyclean-compile: -rm -f src/UriShorten.$(OBJEXT) -rm -f src/UriShorten.lo -rm -f test/FourSuite.$(OBJEXT) + -rm -f test/VersionSuite.$(OBJEXT) -rm -f test/test.$(OBJEXT) -rm -f tool/uriparse-uriparse.$(OBJEXT) @@ -645,6 +671,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/UriResolve.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/UriShorten.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@test/$(DEPDIR)/FourSuite.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@test/$(DEPDIR)/VersionSuite.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@test/$(DEPDIR)/test.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@tool/$(DEPDIR)/uriparse-uriparse.Po@am__quote@ @@ -1236,7 +1263,7 @@ distclean: distclean-recursive -rm -rf src/$(DEPDIR) test/$(DEPDIR) tool/$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ - distclean-libtool distclean-tags + distclean-hdr distclean-libtool distclean-tags dvi: dvi-recursive @@ -1310,16 +1337,16 @@ uninstall-am: uninstall-binPROGRAMS uninstall-libLTLIBRARIES \ clean-libLTLIBRARIES clean-libtool ctags ctags-recursive dist \ dist-all dist-bzip2 dist-gzip dist-lzip dist-lzma dist-shar \ dist-tarZ dist-xz dist-zip distcheck distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distcleancheck distdir distuninstallcheck dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS 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-libLTLIBRARIES install-man install-pdf install-pdf-am \ - install-pkgconfigDATA install-pkgincludeHEADERS install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ + distclean-compile distclean-generic distclean-hdr \ + distclean-libtool distclean-tags distcleancheck distdir \ + distuninstallcheck dvi dvi-am html html-am info info-am \ + install install-am install-binPROGRAMS 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-libLTLIBRARIES install-man install-pdf \ + install-pdf-am install-pkgconfigDATA install-pkgincludeHEADERS \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-recursive uninstall uninstall-am \ -- cgit v1.2.3