diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-03-20 11:05:11 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-03-20 11:05:11 +0000 |
commit | 88542504827505fefe89d2a3547e92146ceb943d (patch) | |
tree | d86fd62bf72f548a5ea980033dcc669aa9d7863a /Build/source/texk | |
parent | 86e05f4101d05860ce03ebdab63d146957b05613 (diff) |
new build system
git-svn-id: svn://tug.org/texlive/trunk@12466 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
-rw-r--r-- | Build/source/texk/configure.in | 57 | ||||
-rw-r--r-- | Build/source/texk/web2c/Makefile.in | 5 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/luafontforge/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/luafontforge/ff-config.in | 47 | ||||
-rw-r--r-- | Build/source/texk/web2c/omegafonts/pl-parser.y (renamed from Build/source/texk/web2c/omegafonts/pl.y) | 0 | ||||
-rw-r--r-- | Build/source/texk/web2c/pdftexdir/.indent.pro | 12 | ||||
-rw-r--r-- | Build/source/texk/web2c/pdftexdir/Makefile.in | 71 | ||||
-rw-r--r-- | Build/source/texk/web2c/pdftexdir/am/pdftex.am | 4 | ||||
-rw-r--r-- | Build/source/texk/web2c/pdftexdir/depend.mk | 55 | ||||
-rw-r--r-- | Build/source/texk/xdvipdfmx/src/Makefile.am.orig | 45 |
10 files changed, 100 insertions, 201 deletions
diff --git a/Build/source/texk/configure.in b/Build/source/texk/configure.in deleted file mode 100644 index 8c7cf884b9e..00000000000 --- a/Build/source/texk/configure.in +++ /dev/null @@ -1,57 +0,0 @@ -dnl Public domain. Originally written many years ago by Karl Berry and -dnl Thomas Esser, and others. -dnl -dnl Top-level configure for kpathsea-using programs. -dnl Our job is to run configure in the relevant subdirectories. -dnl -dnl Assumption: each program will create a c-auto.h that defines -dnl everything kpathsea needs. We arrange this by including (at -dnl autoconf time) kpathsea/common.ac. -dnl -dnl Consequence: we don't need to run configure in the kpathsea directory -dnl itself; we can just copy from a program directory. We'll use the -dnl first one. -dnl -AC_INIT(kpathsea/kpathsea.texi) - -dnl These configure scripts won't work with anything else. -AC_PREREQ(2.59) - -AC_PROG_MAKE_SET - -dnl Because we include make/common.make. -AC_PROG_CC -AC_ISC_POSIX -AC_PROG_LN_S - -dnl If we guessed the prefix in the subdirectories, it might guess -dnl differently than the prefix here, and that would cause confusion. -AC_PREFIX_PROGRAM(tex) - -dnl Pass this down from the top level so that when the subprograms -dnl install kpathsea a command line value is propagated. -AC_PROG_INSTALL - -dnl If the other programs ever acquire their own --with or --enable -dnl options, they must be added, so configure --help at the top level -dnl will show all the options. -sinclude(libtool.m4) -sinclude(withenable.ac) -sinclude(kpathsea/withenable.ac) -sinclude(web2c/withenable.ac) -sinclude(xdvik/withenable.ac) - -AC_PROG_LIBTOOL - -if test "x$with_x" = xno; then - with_xdvik=no -fi - -dnl required subdirs -AC_CONFIG_SUBDIRS([kpathsea web2c]) - -dnl optional subdirs => ESUBDIRS -KPSE_CONFIG_SUBDIRS(kpse_texk_pkglist) - -KPSE_CONFIG_FILES([Makefile]) -AC_OUTPUT diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index 9a5f0e52e45..26c334d2c3d 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -776,9 +776,8 @@ EXTRA_DIST = PROJECTS cftests config.h cpascal.h help.h tangle.web \ $(pdftex_ch_srcs) pdftexdir/pdftex.defines pdftexdir/pdftex.h \ pdftexdir/pdftexextra.in pdftexdir/ChangeLog pdftexdir/NEWS \ pdftexdir/README pdftexdir/change-files.txt \ - pdftexdir/.indent.pro pdftexdir/pdftex.mak \ - pdftexdir/Makefile.in.orig pdftexdir/pdftex.mk \ - pdftexdir/pdftexlib.mk $(luatex_sources) \ + pdftexdir/pdftex.mak pdftexdir/Makefile.in.orig \ + pdftexdir/pdftex.mk pdftexdir/pdftexlib.mk $(luatex_sources) \ luatexdir/luatex.defines luatexdir/luatexextra.in \ luatexdir/ptexlib.h $(luatangle_sources) \ luatexdir/lua51/Makefile luatexdir/lua51/lua.c \ diff --git a/Build/source/texk/web2c/luatexdir/luafontforge/ChangeLog b/Build/source/texk/web2c/luatexdir/luafontforge/ChangeLog new file mode 100644 index 00000000000..b21d051c62b --- /dev/null +++ b/Build/source/texk/web2c/luatexdir/luafontforge/ChangeLog @@ -0,0 +1,5 @@ +2009-03-05 Peter Breitenlohner <peb@mppmu.mpg.de> + + * ff-config.in: new configuration header replacing lots of + defines on the command line. + * fontforge/fontforge/configure-pfaedit.h: include ff-config.h. diff --git a/Build/source/texk/web2c/luatexdir/luafontforge/ff-config.in b/Build/source/texk/web2c/luatexdir/luafontforge/ff-config.in new file mode 100644 index 00000000000..786eb5fe54c --- /dev/null +++ b/Build/source/texk/web2c/luatexdir/luafontforge/ff-config.in @@ -0,0 +1,47 @@ +/* @configure_input@ */ + +/* Guard against double inclusion. */ +#ifndef FF_CONFIG_H +#define FF_CONFIG_H + +/* Define to 1 if you have the <inttypes.h> header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the <langinfo_h> header file. */ +#undef HAVE_LANGINFO_H + +/* Define to 1 if the system has the type `long double'. */ +#undef HAVE_LONG_DOUBLE + +/* Define to 1 if the system has the type `long long int'. */ +#undef HAVE_LONG_LONG_INT + +/* Define to 1 if you have the <memory.h> header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the <stdlib.h> header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the <strings.h> header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the <string.h> header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the <sys/stat.h> header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the <sys/types.h> header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the <unistd.h> header file. */ +#undef HAVE_UNISTD_H + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + +#ifdef HAVE_LONG_LONG_INT +# define _HAS_LONGLONG 1 +#endif + +#endif /* !FF_CONFIG_H */ diff --git a/Build/source/texk/web2c/omegafonts/pl.y b/Build/source/texk/web2c/omegafonts/pl-parser.y index 2833db377cd..2833db377cd 100644 --- a/Build/source/texk/web2c/omegafonts/pl.y +++ b/Build/source/texk/web2c/omegafonts/pl-parser.y diff --git a/Build/source/texk/web2c/pdftexdir/.indent.pro b/Build/source/texk/web2c/pdftexdir/.indent.pro deleted file mode 100644 index e9e690f1ba8..00000000000 --- a/Build/source/texk/web2c/pdftexdir/.indent.pro +++ /dev/null @@ -1,12 +0,0 @@ -/* $Id$ */ ---k-and-r-style ---blank-lines-after-procedures ---line-length 80 ---procnames-start-lines ---no-space-after-function-call-names ---dont-break-procedure-type ---space-after-cast -/* this does not work in indent 2.2.6 :-( */ ---no-tabs -/* this is new in indent 2.2.9 */ ---preprocessor-indentation 2 diff --git a/Build/source/texk/web2c/pdftexdir/Makefile.in b/Build/source/texk/web2c/pdftexdir/Makefile.in deleted file mode 100644 index 23b083a5be0..00000000000 --- a/Build/source/texk/web2c/pdftexdir/Makefile.in +++ /dev/null @@ -1,71 +0,0 @@ -# Makefile for libpdf - te@dbs.uni-hannover.de -# $Id$ - -kpse_include ../make/common.mk -kpse_include ../make/programs.mk -kpse_include ../make/library.mk - -kpathsea_srcdir_parent = $(srcdir)/../.. -kpathsea_dir_parent = ../.. - -ALL_CXXFLAGS = @CXXFLAGS@ @DEFS@ $(XXCFLAGS) \ - -I. -I$(srcdir) \ - -I$(kpathsea_dir_parent) -I$(kpathsea_srcdir_parent) \ - @LIBXPDFCPPFLAGS@ \ - -I$(LIBOBSDCOMPATDIR) -I$(LIBOBSDCOMPATDIR)/.. \ - -I$(LIBOBSDCOMPATSRCDIR) -I$(LIBOBSDCOMPATSRCDIR)/.. \ - -DPDF_PARSER_ONLY -CXX = @CXX@ - -.SUFFIXES: .cc .o -.cc.o: - $(CXX) $(ALL_CXXFLAGS) -c $< - -# XCFLAGS=-Wstrict-prototypes -Wmissing-prototypes - -LIBPNGDIR=../../../libs/libpng -LIBPNGSRCDIR=$(srcdir)/$(LIBPNGDIR) - -ZLIBDIR=../../../libs/zlib -ZLIBSRCDIR=$(srcdir)/$(ZLIBDIR) - -LIBXPDFDIR=../../../libs/xpdf -LIBXPDFSRCDIR=$(srcdir)/$(LIBXPDFDIR) - -LIBMD5DIR=../../../libs/md5 -LIBMD5SRCDIR=$(srcdir)/$(LIBMD5DIR) - -LIBOBSDCOMPATDIR=../../../libs/obsdcompat -LIBOBSDCOMPATSRCDIR=$(srcdir)/$(LIBOBSDCOMPATDIR) - -XCPPFLAGS=-I.. -I$(srcdir)/.. -I../.. -I$(srcdir)/../.. -I$(LIBMD5DIR) \ - -I$(LIBMD5SRCDIR) @LIBPNGCPPFLAGS@ @ZLIBCPPFLAGS@ \ - -I$(LIBXPDFDIR) -I$(LIBXPDFDIR)/.. -I$(LIBXPDFSRCDIR) -I$(LIBXPDFSRCDIR)/.. \ - -I$(LIBOBSDCOMPATDIR) -I$(LIBOBSDCOMPATDIR)/.. -I$(LIBOBSDCOMPATSRCDIR) \ - -I$(LIBOBSDCOMPATSRCDIR)/.. -DpdfTeX - -OBJS = epdf.o mapfile.o utils.o vfpacket.o pkin.o \ -writefont.o writet1.o writet3.o writezip.o writeenc.o writettf.o \ -writejpg.o writejbig2.o writepng.o writeimg.o pdftoepdf.o avl.o avlstuff.o subfont.o tounicode.o - -all: libpdf.a - -pdftosrc.o: $(srcdir)/pdftosrc.cc - -libpdf.a: $(OBJS) - rm -f $@ - $(AR) $(ARFLAGS) $@ $(OBJS) - $(RANLIB) $@ - -kpse_include ../make/clean.mk - -clean:: - rm -f libpdf.a ttf2afm pdftosrc - -depend: - rm -f $(OBJS) ttf2afm.o pdftosrc.o - XXCFLAGS=-MM XCFLAGS=-MM $(MAKE) -k $(OBJS) ttf2afm.o pdftosrc.o | \ - grep -v "^$(CC)\|$(CXX)\|$(AR)\|make\" | \ - sed 's: [^ ]*/\.\./libs/[^ ]*::g' > $(srcdir)/depend.mk - -kpse_include pdftexdir/depend.mk diff --git a/Build/source/texk/web2c/pdftexdir/am/pdftex.am b/Build/source/texk/web2c/pdftexdir/am/pdftex.am index f51b3a3e4af..a47e6fcd233 100644 --- a/Build/source/texk/web2c/pdftexdir/am/pdftex.am +++ b/Build/source/texk/web2c/pdftexdir/am/pdftex.am @@ -150,9 +150,7 @@ EXTRA_DIST += \ ## Not used ## -EXTRA_DIST += \ - pdftexdir/.indent.pro \ - pdftexdir/pdftex.mak +EXTRA_DIST += pdftexdir/pdftex.mak ## Eventually delete these files ## diff --git a/Build/source/texk/web2c/pdftexdir/depend.mk b/Build/source/texk/web2c/pdftexdir/depend.mk deleted file mode 100644 index fa9f9dac2c4..00000000000 --- a/Build/source/texk/web2c/pdftexdir/depend.mk +++ /dev/null @@ -1,55 +0,0 @@ -epdf.o: epdf.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \ - ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h -mapfile.o: mapfile.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \ - ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h -papersiz.o: papersiz.c ptexlib.h ../pdftexd.h ../texmfmp.h \ - ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \ - ptexmac.h -utils.o: utils.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \ - ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h \ - ../../../libs/zlib/zlib.h ../../../libs/zlib/zconf.h \ - ../../../libs/md5/md5.h pdftexextra.h \ - ../../../libs/obsdcompat/openbsd-compat.h -vfpacket.o: vfpacket.c ptexlib.h ../pdftexd.h ../texmfmp.h \ - ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \ - ptexmac.h -pkin.o: pkin.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \ - ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h -writefont.o: writefont.c ../../../libs/xpdf/goo/gmem.h ptexlib.h \ - ../pdftexd.h ../texmfmp.h ../cpascal.h ../config.h ../help.h \ - ../texmfmem.h ../pdftexcoerce.h ptexmac.h -writet1.o: writet1.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \ - ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h -writet3.o: writet3.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \ - ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h -writezip.o: writezip.c ptexlib.h ../pdftexd.h ../texmfmp.h \ - ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \ - ptexmac.h ../../../libs/zlib/zlib.h ../../../libs/zlib/zconf.h -writeenc.o: writeenc.c ptexlib.h ../pdftexd.h ../texmfmp.h \ - ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \ - ptexmac.h -writettf.o: writettf.c ptexlib.h writettf.h ../pdftexd.h ../texmfmp.h \ - ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \ - ptexmac.h macnames.c -writejpg.o: writejpg.c ptexlib.h ../pdftexd.h ../texmfmp.h \ - ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \ - ptexmac.h image.h -writepng.o: writepng.c ptexlib.h ../pdftexd.h ../texmfmp.h \ - ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \ - ptexmac.h image.h -writeimg.o: writeimg.c ptexlib.h ../pdftexd.h ../texmfmp.h \ - ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \ - ptexmac.h image.h -pdftoepdf.o: pdftoepdf.cc ../../../libs/xpdf/xpdf/Object.h \ - ../../../libs/xpdf/goo/gmem.h ../../../libs/xpdf/xpdf/Array.h \ - ../../../libs/xpdf/xpdf/Dict.h ../../../libs/xpdf/xpdf/Stream.h \ - ../../../libs/xpdf/xpdf/XRef.h ../../../libs/xpdf/xpdf/Catalog.h \ - ../../../libs/xpdf/xpdf/Page.h ../../../libs/xpdf/xpdf/GfxFont.h \ - ../../../libs/xpdf/xpdf/Error.h epdf.h -ttf2afm.o: ttf2afm.c writettf.h macnames.c -pdftosrc.o: pdftosrc.cc ../../../libs/xpdf/xpdf/Object.h \ - ../../../libs/xpdf/xpdf/Array.h ../../../libs/xpdf/xpdf/Dict.h \ - ../../../libs/xpdf/xpdf/Stream.h ../../../libs/xpdf/xpdf/XRef.h \ - ../../../libs/xpdf/xpdf/Catalog.h ../../../libs/xpdf/xpdf/Page.h \ - ../../../libs/xpdf/xpdf/PDFDoc.h ../../../libs/xpdf/xpdf/Link.h \ - ../../../libs/xpdf/xpdf/Error.h ../../../libs/xpdf/xpdf/config.h diff --git a/Build/source/texk/xdvipdfmx/src/Makefile.am.orig b/Build/source/texk/xdvipdfmx/src/Makefile.am.orig new file mode 100644 index 00000000000..cc48aad185c --- /dev/null +++ b/Build/source/texk/xdvipdfmx/src/Makefile.am.orig @@ -0,0 +1,45 @@ +bin_PROGRAMS = xdvipdfmx +xdvipdfmx_SOURCES = agl.c agl_standard.c bmpimage.c cff.c cff_dict.c cid.c cidtype0.c cidtype2.c \ +cmap.c cmap_read.c cmap_write.c cs_type2.c \ +dpxconf.c dpxcrypt.c dpxfile.c dpxutil.c \ +dvi.c dvipdfmx.c epdf.c error.c fontmap.c jpegimage.c mem.c mfileio.c mpost.c \ +numbers.c otl_conf.c otl_opt.c pdfcolor.c pdfdev.c pdfdoc.c pdfdraw.c pdfencoding.c \ +pdfencrypt.c pdffont.c pdfnames.c pdfobj.c pdfparse.c pdfresource.c pdfximage.c \ +pkfont.c pngimage.c pst.c pst_obj.c sfnt.c \ +spc_color.c spc_dvips.c spc_html.c spc_misc.c spc_pdfm.c spc_tpic.c spc_util.c spc_xtx.c specials.c \ +subfont.c tfm.c \ +tt_aux.c tt_cmap.c tt_glyf.c tt_gsub.c tt_post.c tt_table.c truetype.c \ +type0.c t1_char.c t1_load.c type1.c type1c.c \ +unicode.c vf.c xbb.c \ +agl.h bmpimage.h asl_charset.h cff.h cff_dict.h cff_limits.h cff_stdstr.h cff_types.h \ +cid.h cid_basefont.h cid_p.h cidtype0.h cidtype2.h cmap.h cmap_p.h cmap_read.h cmap_write.h \ +cs_type2.h dpxconf.h dpxcrypt.h dpxutil.h dpxfile.h dvi.h dvicodes.h epdf.h error.h fontmap.h \ +jpegimage.h mem.h mfileio.h mpost.h numbers.h otl_conf.h otl_opt.h pdfcolor.h pdfdev.h \ +pdfdoc.h pdfdraw.h pdfencoding.h pdfencrypt.h pdffont.h pdflimits.h pdfnames.h pdfobj.h \ +pdfparse.h pdfresource.h pdfximage.h pkfont.h pngimage.h pst.h pst_obj.h sfnt.h \ +spc_color.h spc_dvips.h spc_html.h spc_misc.h spc_pdfm.h spc_tpic.h spc_util.h spc_xtx.h specials.h \ +subfont.h system.h tfm.h \ +tt_aux.h tt_cmap.h tt_glyf.h tt_gsub.h tt_post.h tt_table.h truetype.h \ +type0.h t1_char.h t1_load.h type1.h type1c.h \ +unicode.h vf.h xbb.h + + +LIBPNGDIR=$(top_builddir)/../../libs/libpng +LIBPNGSRCDIR=$(srcdir)/$(LIBPNGDIR) +LIBPNGDEP = @LIBPNGDEP@ +LDLIBPNG = @LDLIBPNG@ + +ZLIBDIR=$(top_builddir)/../../libs/zlib +ZLIBSRCDIR=$(srcdir)/$(ZLIBDIR) +ZLIBDEP = @ZLIBDEP@ +LDZLIB = @LDZLIB@ + +FREETYPE2DIR = $(top_builddir)/../../libs/freetype2 +FREETYPE2SRCDIR = $(srcdir)/$(FREETYPE2DIR) +LDFREETYPE2 = @LDFREETYPE2@ +FREETYPE2DEP = @FREETYPE2DEP@ + +xdvipdfmx_CPPFLAGS = @LIBPNGCPPFLAGS@ @ZLIBCPPFLAGS@ @FREETYPE2CPPFLAGS@ +xdvipdfmx_LDADD = $(LDADD) $(LDLIBPNG) $(LDZLIB) $(LDFREETYPE2) +xdvipdfmx_DEPENDENCIES = $(ZLIBDEP) $(LIBPNGDEP) $(FREETYPE2DEP) +xdvipdfmx_LDFLAGS = @xdvipdfmx_LDFLAGS@ |