diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-05-27 09:46:39 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-05-27 09:46:39 +0000 |
commit | 548c801baf05f4a158b42c8de28378a2a44bfa89 (patch) | |
tree | e2ee4779c72604a8838da3a8c6fe2e3774db0a20 /Build/source/texk/xdv2pdf | |
parent | e4da8ade35c41f81e0f39a6fb40af0e50d1e0c8b (diff) |
change ipc default to enabled, remove obsolete files
git-svn-id: svn://tug.org/texlive/trunk@13492 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/xdv2pdf')
-rw-r--r-- | Build/source/texk/xdv2pdf/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/texk/xdv2pdf/Makefile.am | 12 | ||||
-rw-r--r-- | Build/source/texk/xdv2pdf/Makefile.in | 3 | ||||
-rw-r--r-- | Build/source/texk/xdv2pdf/Makefile.in.orig | 80 | ||||
-rw-r--r-- | Build/source/texk/xdv2pdf/acconfig.h.dist | 37 | ||||
-rw-r--r-- | Build/source/texk/xdv2pdf/acconfig.h.in | 45 | ||||
-rw-r--r-- | Build/source/texk/xdv2pdf/configure.in.orig | 66 |
7 files changed, 9 insertions, 238 deletions
diff --git a/Build/source/texk/xdv2pdf/ChangeLog b/Build/source/texk/xdv2pdf/ChangeLog index 080253a1726..fc094da6b99 100644 --- a/Build/source/texk/xdv2pdf/ChangeLog +++ b/Build/source/texk/xdv2pdf/ChangeLog @@ -1,3 +1,7 @@ +2009-05-27 Peter Breitenlohner <peb@mppmu.mpg.de> + + Adapt to TL2009 build system. + 2009-03-19 Peter Breitenlohner <peb@mppmu.mpg.de> * T1Wrap.m, xdv2pdf.cpp: Use again config.h, not c-auto.h. diff --git a/Build/source/texk/xdv2pdf/Makefile.am b/Build/source/texk/xdv2pdf/Makefile.am index 0f39234077f..0866637d675 100644 --- a/Build/source/texk/xdv2pdf/Makefile.am +++ b/Build/source/texk/xdv2pdf/Makefile.am @@ -1,3 +1,7 @@ +## Makefile.am for the TeX Live subdirectory texk/dtl/ +## +## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I ../../m4 @@ -35,11 +39,3 @@ xdv2pdf_LDADD = $(KPATHSEA_LIBS) EXTRA_DIST = LICENSE.txt -## Eventually delete these files -## -EXTRA_DIST += \ - Makefile.in.orig \ - acconfig.h.dist \ - acconfig.h.in \ - configure.in.orig - diff --git a/Build/source/texk/xdv2pdf/Makefile.in b/Build/source/texk/xdv2pdf/Makefile.in index cc83783089b..ef16d03e52f 100644 --- a/Build/source/texk/xdv2pdf/Makefile.in +++ b/Build/source/texk/xdv2pdf/Makefile.in @@ -275,8 +275,7 @@ xdv2pdf_SOURCES = \ EXTRA_xdv2pdf_SOURCES = appleGlyphNames.c xdv2pdf_LDFLAGS = -framework Carbon -framework QuickTime xdv2pdf_LDADD = $(KPATHSEA_LIBS) -EXTRA_DIST = LICENSE.txt Makefile.in.orig acconfig.h.dist \ - acconfig.h.in configure.in.orig +EXTRA_DIST = LICENSE.txt all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am diff --git a/Build/source/texk/xdv2pdf/Makefile.in.orig b/Build/source/texk/xdv2pdf/Makefile.in.orig deleted file mode 100644 index 1b1183e6562..00000000000 --- a/Build/source/texk/xdv2pdf/Makefile.in.orig +++ /dev/null @@ -1,80 +0,0 @@ -# @configure_input@ - -kpse_include ../make/paths.mk -kpse_include ../make/common.mk -kpse_include ../make/programs.mk - -CXX = c++ -OBJC = cc -CXXLD = $(CXX) -cxx_link_command = $(CXXLD) -o $@ $(LDFLAGS) -kpathsea_cxx_link = $(LIBTOOL) --mode=link $(cxx_link_command) - -ALL_CXXFLAGS = @CXXFLAGS@ @DEFS@ $(XXCFLAGS) -I. -I$(srcdir) -ALL_OBJCFLAGS = @DEFS@ $(XXOBJCFLAGS) -I. -I$(srcdir) - -.SUFFIXES: .cpp .o .m -.cpp.o: - $(CXX) $(ALL_CXXFLAGS) -c $< -.m.o: - $(OBJC) $(ALL_OBJCFLAGS) -c $< - -FRAMEWORKS = \ - -framework Carbon \ - -framework QuickTime - -FRAMEWORKS_t1w = -framework Cocoa -LIBS_t1w = # -lm - -program = xdv2pdf -t1wrap = T1Wrap -programs = $(program) $(t1wrap) -default all: $(programs) - -objects=xdv2pdf_main.o xdv2pdf.o xdv2pdf_specials.o - -objects_t1w=T1Wrap.o SimplePSInterpreter.o - -$(objects): Makefile -$(objects_t1m): Makefile - -$(program): $(objects) $(kpathsea) $(ALL_LIBS_DEP) - $(kpathsea_cxx_link) $(objects) $(FRAMEWORKS) $(LOADLIBES) - -$(t1wrap): $(objects_t1w) - $(kpathsea_cxx_link) $(objects_t1w) $(FRAMEWORKS_t1w) $(LOADLIBES) - -T1Wrap.o: $(srcdir)/T1Wrap.m - $(OBJC) $(ALL_OBJCFLAGS) -c $< - -SimplePSInterpreter.o: $(srcdir)/SimplePSInterpreter.m - $(OBJC) $(ALL_OBJCFLAGS) -c $< - -kpse_include ../make/tkpathsea.mk - -install: install-exec install-data -uninstall: uninstall-exec uninstall-data - -distclean:: - $(RM) c-auto.h - -install-exec: - $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir) - $(INSTALL_LIBTOOL_PROG) $(program) $(bindir) - $(INSTALL) $(t1wrap) $(bindir) - -uninstall-exec: - cd $(bindir); rm -f $(programs) - -install-data: - $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir) - -uninstall-data: - -kpse_include ../make/config.mk - -info dvi check: - -kpse_include ../make/clean.mk -kpse_include ../make/rdepend.mk -kpse_include depend.mk diff --git a/Build/source/texk/xdv2pdf/acconfig.h.dist b/Build/source/texk/xdv2pdf/acconfig.h.dist deleted file mode 100644 index ee49123b348..00000000000 --- a/Build/source/texk/xdv2pdf/acconfig.h.dist +++ /dev/null @@ -1,37 +0,0 @@ -#define VERSION 0 - -#define PACKAGE "package" - -/* define if you have kpathsea */ -#undef HAVE_KPATHSEA - -/* define if your zlib has the compress2 function */ -#undef HAVE_ZLIB_COMPRESS2 - -/* define if you have zlib and its headers */ -#undef HAVE_ZLIB - -/* define if you have xbasename() in your libkpathsea instead of basename() */ -#undef HAVE_XBASENAME - -/* define if kpathsea understands TrueType (TTF) formats */ -#undef HAVE_TTF_FORMATS - -/* define if struct tm has tm_gmtoff as a member */ -#undef HAVE_TM_GMTOFF - -/* define if <time.h> has timezone as an external variable */ -#undef HAVE_TIMEZONE - -/* define if kpathsea supports type1 and vf formats */ -#undef HAVE_KPSE_FORMATS - -/* define if you have libpng */ -#undef HAVE_LIBPNG - -/* Define if kpathsea understands Omega (OFM/OVF) formats */ -#undef HAVE_OMEGA_FORMATS - - - - diff --git a/Build/source/texk/xdv2pdf/acconfig.h.in b/Build/source/texk/xdv2pdf/acconfig.h.in deleted file mode 100644 index e81beaf36c9..00000000000 --- a/Build/source/texk/xdv2pdf/acconfig.h.in +++ /dev/null @@ -1,45 +0,0 @@ - -/* Local variables defined by MAW */ -#ifndef _CONFIG_H - -#define VERSION 0 - -#define PACKAGE "package" - -/* HAVE_TIMEZONE - Define if <time.h> has timezone as an external variable */ -#undef HAVE_TIMEZONE - -/* HAVE_TM_GMTOFF - Define if struct tm has tm_gmtoff as a member */ -#undef HAVE_TM_GMTOFF - -/* HAVE_KPATHSEA - Define if you have kpathsea */ -#define HAVE_KPATHSEA - -/* HAVE_XBASENAME - Define if you have xbasename() in your libkpathsea instead of basename() */ -#undef HAVE_XBASENAME - -/* HAVE_ZLIB - Define if you have zlib and its headers */ -#undef HAVE_ZLIB -/* HAVE_ZLIB_COMPRESS2 - Define if your zlib has the compress2 function */ -#undef HAVE_ZLIB_COMPRESS2 - -/* HAVE_KPSE_FORMATS - Define if you have a - version of kpathsea with type1 and vf formats */ -#define HAVE_KPSE_FORMATS - -/* HAVE_OMEGA_FORMATS - Define if you have a - version of kpathsea that understands Omega (OFM/OVF) formats */ -#define HAVE_OMEGA_FORMATS - -/* HAVE_TTF_FORMATS - Define if you have a - version of kpathsea that understands TrueType (TTF) formats */ -#define HAVE_TTF_FORMATS - -/* HAVE_LIBPNG - Define if you have libpng */ -#undef HAVE_LIBPNG - -/* HAVE_SYSTEM - Define if you have the system() command */ -#undef HAVE_SYSTEM - - -#endif /* _CONFIG_H */ diff --git a/Build/source/texk/xdv2pdf/configure.in.orig b/Build/source/texk/xdv2pdf/configure.in.orig deleted file mode 100644 index 5e89a2cd668..00000000000 --- a/Build/source/texk/xdv2pdf/configure.in.orig +++ /dev/null @@ -1,66 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. -AC_INIT(xdv2pdf.cpp) - -define([_version_],"0.998") - -VERSION=_version_ -AC_SUBST(VERSION) -AC_DEFINE(VERSION, _version_, [package version]) -AC_DEFINE(PACKAGE, "xdv2pdf", [package name]) - -AC_CONFIG_HEADERS([c-auto.h:c-auto.in], [date >stamp-auto]) - -dnl Disable maintainer portions of included makefile fragments -MAINT='#' -AC_SUBST(MAINT) - -dnl First, check if we're configuring on Mac OS X -- can't build elsewhere - -sinclude(../web2c/xetexdir/tests.ac) - -AC_HAS_CARBON -if test "x$has_carbon" = xno; then - with_xdv2pdf=no - exit -fi - -AC_HAS_QUICKTIME -if test "x$has_quicktime" = xno; then - with_xdv2pdf=no - exit -fi - -dnl Checks for programs. -AC_PROG_CC -AC_PROG_CXX -AC_PROG_CPP -AC_PROG_INSTALL -AC_PROG_LN_S -AC_PROG_MAKE_SET - -AC_DEFINE([KPATHSEA], 1, [define if you have kpathsea]) -AC_DEFINE([HAVE_KPATHSEA], 1, [define if you have kpathsea]) -AC_DEFINE([HAVE_KPSE_FORMATS], 1, [define if kpathsea supports type1 and vf formats]) - -TTF_OPT='' -AC_SUBST(TTF_OPT) - -dnl Checks for header files. -AC_HEADER_STDC -AC_CHECK_HEADERS(unistd.h) - -dnl Checks for typedefs, structures, and compiler characteristics. -AC_C_CONST -AC_TYPE_SIZE_T -AC_STRUCT_TM - -AC_C_BIGENDIAN - -dnl Checks for library functions. -AC_FUNC_MEMCMP -AC_CHECK_FUNCS(strspn system) -AC_CHECK_LIB(m, main) - -KPSE_CONFIG_FILES([Makefile]) - -AC_OUTPUT |