diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-11-20 09:15:29 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-11-20 09:15:29 +0000 |
commit | ac005f402389542b123fd41fd9fc54322f3becf1 (patch) | |
tree | 6234c1b385dd10b6716c676108ecf68856ea7480 /Build/source/libs/teckit | |
parent | 9301a1dd22ac8cedf4f7f980c96ef9e4f2bd37c2 (diff) |
somewhat reorganize libs build system
git-svn-id: svn://tug.org/texlive/trunk@16091 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/teckit')
-rw-r--r-- | Build/source/libs/teckit/Makefile.am | 2 | ||||
-rw-r--r-- | Build/source/libs/teckit/Makefile.in | 2 | ||||
-rw-r--r-- | Build/source/libs/teckit/ac/teckit.ac | 2 | ||||
-rwxr-xr-x | Build/source/libs/teckit/configure | 10 | ||||
-rw-r--r-- | Build/source/libs/teckit/configure.ac | 2 | ||||
-rw-r--r-- | Build/source/libs/teckit/include/teckit/Makefile.am (renamed from Build/source/libs/teckit/teckit/Makefile.am) | 0 | ||||
-rw-r--r-- | Build/source/libs/teckit/include/teckit/Makefile.in (renamed from Build/source/libs/teckit/teckit/Makefile.in) | 6 |
7 files changed, 12 insertions, 12 deletions
diff --git a/Build/source/libs/teckit/Makefile.am b/Build/source/libs/teckit/Makefile.am index 1779ce29342..265e2ab4eb6 100644 --- a/Build/source/libs/teckit/Makefile.am +++ b/Build/source/libs/teckit/Makefile.am @@ -24,7 +24,7 @@ EXTRA_DIST += $(TECKIT_TREE)-PATCHES dist-hook: rm -rf `find $(distdir) -name .svn` -SUBDIRS = teckit +SUBDIRS = include/teckit INCLUDES = -I$(top_srcdir)/$(TECKIT_TREE)/source/Public-headers $(ZLIB_INCLUDES) AM_CPPFLAGS = -DNDEBUG diff --git a/Build/source/libs/teckit/Makefile.in b/Build/source/libs/teckit/Makefile.in index f5f8a9750dc..767069dbf7b 100644 --- a/Build/source/libs/teckit/Makefile.in +++ b/Build/source/libs/teckit/Makefile.in @@ -262,7 +262,7 @@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../../m4 EXTRA_DIST = $(TECKIT_TREE) $(TECKIT_TREE)-PATCHES teckit.test \ tex-text.map tex-text.tec -SUBDIRS = teckit +SUBDIRS = include/teckit INCLUDES = -I$(top_srcdir)/$(TECKIT_TREE)/source/Public-headers $(ZLIB_INCLUDES) AM_CPPFLAGS = -DNDEBUG AM_CFLAGS = $(WARNING_CFLAGS) diff --git a/Build/source/libs/teckit/ac/teckit.ac b/Build/source/libs/teckit/ac/teckit.ac index 3e8bb57da52..8655196b761 100644 --- a/Build/source/libs/teckit/ac/teckit.ac +++ b/Build/source/libs/teckit/ac/teckit.ac @@ -5,5 +5,5 @@ dnl You may freely use, modify and/or distribute this file. dnl ## basic check of system teckit KPSE_TRY_LIBXX([teckit], - [#include <TECkit_Engine.h>], + [#include <teckit/TECkit_Engine.h>], [TECkit_Converter converter; TECkit_DisposeConverter(converter);]) diff --git a/Build/source/libs/teckit/configure b/Build/source/libs/teckit/configure index fb732d16f77..2335df7cfc3 100755 --- a/Build/source/libs/teckit/configure +++ b/Build/source/libs/teckit/configure @@ -5597,7 +5597,7 @@ if test "x$with_zlib_libdir" != x && test "x$with_zlib_libdir" != xyes; then ZLIB_LIBS="-L$with_zlib_libdir $ZLIB_LIBS" fi else - ZLIB_INCLUDES=`echo '-IBLD/libs/zlib' | sed \ + ZLIB_INCLUDES=`echo '-IBLD/libs/zlib/include' | sed \ -e "s,SRC/,$kpse_SRC/,g" \ -e "s,BLD/,$kpse_BLD/,g"` ZLIB_LIBS=`echo 'BLD/libs/zlib/libz.a' | sed \ @@ -5606,9 +5606,9 @@ else ZLIB_DEPEND=`echo 'BLD/libs/zlib/libz.a' | sed \ -e 's,BLD/,${top_builddir}/../../,g'` ZLIB_RULE='# Rebuild libz -$(ZLIB_DEPEND): ${top_builddir}/../../libs/zlib/zlib.h ${top_builddir}/../../libs/zlib/zconf.h +$(ZLIB_DEPEND): ${top_builddir}/../../libs/zlib/include/zconf.h cd ${top_builddir}/../../libs/zlib && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../../libs/zlib/zlib.h ${top_builddir}/../../libs/zlib/zconf.h: +${top_builddir}/../../libs/zlib/include/zconf.h: cd ${top_builddir}/../../libs/zlib && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi @@ -5666,7 +5666,7 @@ fi TECKIT_TREE=TECkit-2.5.1 -ac_config_files="$ac_config_files Makefile teckit/Makefile" +ac_config_files="$ac_config_files Makefile include/teckit/Makefile" cat >confcache <<\_ACEOF @@ -6393,7 +6393,7 @@ do "CXXLD.sh") CONFIG_FILES="$CONFIG_FILES CXXLD.sh:README" ;; "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "teckit/Makefile") CONFIG_FILES="$CONFIG_FILES teckit/Makefile" ;; + "include/teckit/Makefile") CONFIG_FILES="$CONFIG_FILES include/teckit/Makefile" ;; *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac diff --git a/Build/source/libs/teckit/configure.ac b/Build/source/libs/teckit/configure.ac index 92f4401d422..79297500a6b 100644 --- a/Build/source/libs/teckit/configure.ac +++ b/Build/source/libs/teckit/configure.ac @@ -54,6 +54,6 @@ fi TECKIT_TREE=TECkit-[]TECkit_version AC_SUBST([TECKIT_TREE]) -AC_CONFIG_FILES([Makefile teckit/Makefile]) +AC_CONFIG_FILES([Makefile include/teckit/Makefile]) AC_OUTPUT diff --git a/Build/source/libs/teckit/teckit/Makefile.am b/Build/source/libs/teckit/include/teckit/Makefile.am index 36e5522a210..36e5522a210 100644 --- a/Build/source/libs/teckit/teckit/Makefile.am +++ b/Build/source/libs/teckit/include/teckit/Makefile.am diff --git a/Build/source/libs/teckit/teckit/Makefile.in b/Build/source/libs/teckit/include/teckit/Makefile.in index 7ccc49eaff2..cbc0a706a05 100644 --- a/Build/source/libs/teckit/teckit/Makefile.in +++ b/Build/source/libs/teckit/include/teckit/Makefile.in @@ -33,7 +33,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -subdir = teckit +subdir = include/teckit DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ @@ -179,9 +179,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign teckit/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/teckit/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign teckit/Makefile + $(AUTOMAKE) --foreign include/teckit/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ |