diff options
| author | Mike Hommey <glandium@debian.org> | 2010-03-18 07:41:21 +0100 |
|---|---|---|
| committer | Mike Hommey <glandium@debian.org> | 2010-03-18 07:42:59 +0100 |
| commit | 8a4aad62c5cb21da7cd5cc42e54fc02c6ad86966 (patch) | |
| tree | f80336aa670a71c716fc4b0363f6ced3c86940bb /example | |
| parent | ddaa8a96ed86663861266bf05ab7bd299dadcf61 (diff) | |
| parent | eb5d521a2df72fa829a7f8196b957c696e7ccc58 (diff) | |
| download | libxml2-8a4aad62c5cb21da7cd5cc42e54fc02c6ad86966.tar.gz | |
Merge branch 'upstream'
Conflicts:
aclocal.m4
config.guess
config.sub
configure
ltmain.sh
Diffstat (limited to 'example')
| -rw-r--r-- | example/Makefile.in | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/example/Makefile.in b/example/Makefile.in index 9a2f5cc..f7c60a6 100644 --- a/example/Makefile.in +++ b/example/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -38,8 +38,10 @@ noinst_PROGRAMS = gjobread$(EXEEXT) subdir = example DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |