Diff for /embedaddon/libxml2/Makefile.am between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2012/02/21 23:37:58 version 1.1.1.2, 2013/07/22 01:22:20
Line 6  SUBDIRS = include . doc example xstc @PYTHON_SUBDIR@ Line 6  SUBDIRS = include . doc example xstc @PYTHON_SUBDIR@
   
 DIST_SUBDIRS = include . doc example python xstc  DIST_SUBDIRS = include . doc example python xstc
   
INCLUDES = -I$(top_builddir)/include -I@srcdir@/include @THREAD_CFLAGS@ @Z_CFLAGS@ INCLUDES = -I$(top_builddir)/include -I@srcdir@/include @THREAD_CFLAGS@ @Z_CFLAGS@ @LZMA_CFLAGS@
   
 noinst_PROGRAMS=testSchemas testRelax testSAX testHTML testXPath testURI \  noinst_PROGRAMS=testSchemas testRelax testSAX testHTML testXPath testURI \
                 testThreads testC14N testAutomata testRegexp \                  testThreads testC14N testAutomata testRegexp \
Line 18  bin_PROGRAMS = xmllint xmlcatalog Line 18  bin_PROGRAMS = xmllint xmlcatalog
 bin_SCRIPTS=xml2-config  bin_SCRIPTS=xml2-config
   
 lib_LTLIBRARIES = libxml2.la  lib_LTLIBRARIES = libxml2.la
libxml2_la_LIBADD = @THREAD_LIBS@ @Z_LIBS@ $(ICONV_LIBS) @M_LIBS@ @WIN32_EXTRA_LIBADD@libxml2_la_LIBADD = @THREAD_LIBS@ @Z_LIBS@ @LZMA_LIBS@ $(ICONV_LIBS) @M_LIBS@ @WIN32_EXTRA_LIBADD@
   
 if USE_VERSION_SCRIPT  if USE_VERSION_SCRIPT
 LIBXML2_VERSION_SCRIPT = $(VERSION_SCRIPT_FLAGS)$(srcdir)/libxml2.syms  LIBXML2_VERSION_SCRIPT = $(VERSION_SCRIPT_FLAGS)$(srcdir)/libxml2.syms
Line 40  libxml2_la_SOURCES = SAX.c entities.c encoding.c error Line 40  libxml2_la_SOURCES = SAX.c entities.c encoding.c error
                 xmlregexp.c xmlschemas.c xmlschemastypes.c xmlunicode.c \                  xmlregexp.c xmlschemas.c xmlschemastypes.c xmlunicode.c \
                 triostr.c trio.c xmlreader.c relaxng.c dict.c SAX2.c \                  triostr.c trio.c xmlreader.c relaxng.c dict.c SAX2.c \
                 xmlwriter.c legacy.c chvalid.c pattern.c xmlsave.c \                  xmlwriter.c legacy.c chvalid.c pattern.c xmlsave.c \
                xmlmodule.c schematron.c                xmlmodule.c schematron.c xzlib.c
 else  else
 libxml2_la_SOURCES = SAX.c entities.c encoding.c error.c parserInternals.c  \  libxml2_la_SOURCES = SAX.c entities.c encoding.c error.c parserInternals.c  \
                 parser.c tree.c hash.c list.c xmlIO.c xmlmemory.c uri.c  \                  parser.c tree.c hash.c list.c xmlIO.c xmlmemory.c uri.c  \
Line 50  libxml2_la_SOURCES = SAX.c entities.c encoding.c error Line 50  libxml2_la_SOURCES = SAX.c entities.c encoding.c error
                 xmlregexp.c xmlschemas.c xmlschemastypes.c xmlunicode.c \                  xmlregexp.c xmlschemas.c xmlschemastypes.c xmlunicode.c \
                 xmlreader.c relaxng.c dict.c SAX2.c \                  xmlreader.c relaxng.c dict.c SAX2.c \
                 xmlwriter.c legacy.c chvalid.c pattern.c xmlsave.c \                  xmlwriter.c legacy.c chvalid.c pattern.c xmlsave.c \
                xmlmodule.c schematron.c                xmlmodule.c schematron.c xzlib.c
 endif  endif
   
 DEPS = $(top_builddir)/libxml2.la  DEPS = $(top_builddir)/libxml2.la
LDADDS = @STATIC_BINARIES@ $(top_builddir)/libxml2.la @THREAD_LIBS@ @Z_LIBS@ $(ICONV_LIBS) @M_LIBS@ @WIN32_EXTRA_LIBADD@LDADDS = @STATIC_BINARIES@ $(top_builddir)/libxml2.la @THREAD_LIBS@ @Z_LIBS@ @LZMA_LIBS@ $(ICONV_LIBS) @M_LIBS@ @WIN32_EXTRA_LIBADD@
   
   
 man_MANS = xml2-config.1 libxml.3  man_MANS = xml2-config.1 libxml.3
Line 1152  cleanup: Line 1152  cleanup:
   
 dist-hook: cleanup libxml2.spec  dist-hook: cleanup libxml2.spec
         -cp libxml2.spec $(distdir)          -cp libxml2.spec $(distdir)
        (cd $(srcdir) ; tar -cf - --exclude CVS --exclude .svn win32 macos vms VxWorks bakefile test result) | (cd $(distdir); tar xf -)        (cd $(srcdir) ; tar -cf - --exclude CVS --exclude .svn --exclude .git win32 macos vms VxWorks bakefile test result) | (cd $(distdir); tar xf -)
   
 dist-source: distdir  dist-source: distdir
         $(AMTAR) -chof - --exclude Tests --exclude test --exclude result $(distdir) | GZIP=$(GZIP_ENV) gzip -c >`echo "$(distdir)" | sed "s+libxml2+libxml2-sources+"`.tar.gz          $(AMTAR) -chof - --exclude Tests --exclude test --exclude result $(distdir) | GZIP=$(GZIP_ENV) gzip -c >`echo "$(distdir)" | sed "s+libxml2+libxml2-sources+"`.tar.gz
   
 dist-test: distdir  dist-test: distdir
         (mkdir -p $(distdir))          (mkdir -p $(distdir))
        (cd $(srcdir) ; tar -cf - --exclude CVS --exclude .svn xstc/Tests) | (cd $(distdir); tar xf -)        (cd $(srcdir) ; tar -cf - --exclude CVS --exclude .svn --exclude .git xstc/Tests) | (cd $(distdir); tar xf -)
         tar -cf - $(distdir)/test $(distdir)/result $(distdir)/xstc/Tests  $(distdir)/Makefile.tests $(distdir)/README $(distdir)/README.tests $(distdir)/AUTHORS $(distdir)/testapi.c $(distdir)/runtest.c $(distdir)/runsuite.c | GZIP=$(GZIP_ENV) gzip -c >`echo "$(distdir)" | sed "s+libxml2+libxml2-tests+"`.tar.gz          tar -cf - $(distdir)/test $(distdir)/result $(distdir)/xstc/Tests  $(distdir)/Makefile.tests $(distdir)/README $(distdir)/README.tests $(distdir)/AUTHORS $(distdir)/testapi.c $(distdir)/runtest.c $(distdir)/runsuite.c | GZIP=$(GZIP_ENV) gzip -c >`echo "$(distdir)" | sed "s+libxml2+libxml2-tests+"`.tar.gz
         @(rm -rf $(distdir)/xstc/Test)          @(rm -rf $(distdir)/xstc/Test)
   
Line 1195  EXTRA_DIST = xml2-config.in xml2Conf.sh.in libxml.spec Line 1195  EXTRA_DIST = xml2-config.in xml2Conf.sh.in libxml.spec
              example/Makefile.am example/gjobread.c example/gjobs.xml \               example/Makefile.am example/gjobread.c example/gjobs.xml \
              $(man_MANS) libxml-2.0.pc.in libxml-2.0-uninstalled.pc.in \               $(man_MANS) libxml-2.0.pc.in libxml-2.0-uninstalled.pc.in \
              trionan.c trionan.h triostr.c triostr.h trio.c trio.h \               trionan.c trionan.h triostr.c triostr.h trio.c trio.h \
             triop.h triodef.h libxml.h elfgcchack.h \             triop.h triodef.h libxml.h elfgcchack.h xzlib.h \
              testThreadsWin32.c genUnicode.py TODO_SCHEMAS \               testThreadsWin32.c genUnicode.py TODO_SCHEMAS \
              dbgen.pl dbgenattr.pl regressions.py regressions.xml \               dbgen.pl dbgenattr.pl regressions.py regressions.xml \
              README.tests Makefile.tests libxml2.syms \               README.tests Makefile.tests libxml2.syms \
Line 1231  uninstall-local: Line 1231  uninstall-local:
         rm -rf $(DESTDIR)$(BASE_DIR)/$(DOC_MODULE)          rm -rf $(DESTDIR)$(BASE_DIR)/$(DOC_MODULE)
   
 tst: tst.c  tst: tst.c
        $(CC) $(CFLAGS) -Iinclude -o tst tst.c .libs/libxml2.a -lpthread -lm -lz        $(CC) $(CFLAGS) -Iinclude -o tst tst.c .libs/libxml2.a -lpthread -lm -lz -llzma
   
 sparse: clean  sparse: clean
         $(MAKE) CC=cgcc          $(MAKE) CC=cgcc

Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>