new build system: build icu libs and xetex plus misc updates

git-svn-id: svn://tug.org/texlive/trunk@12759 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 92 insertions, 86 deletions

diff --git a/Build/source/texk/web2c/pdftexdir/am/libpdftex.am b/Build/source/texk/web2c/pdftexdir/am/libpdftex.am
new file mode 100644
index 00000000000..7b464242f0e
--- /dev/null
+++ b/Build/source/texk/web2c/pdftexdir/am/libpdftex.am
@@ -0,0 +1,61 @@
+## texk/web2c/pdftexdir/am/libpdftex.am: Makefile fragment for libpdftex.
+
+## libpdftex
+##
+EXTRA_LIBRARIES += libpdftex.a
+
+libpdftex_a_CPPFLAGS = $(pdftex_cppflags)
+
+libpdftex_a_SOURCES = \
+	pdftexdir/avl.c \
+	pdftexdir/avl.h \
+	pdftexdir/avlstuff.c \
+	pdftexdir/avlstuff.h \
+	pdftexdir/epdf.c \
+	pdftexdir/epdf.h \
+	pdftexdir/image.h \
+	pdftexdir/mapfile.c \
+	pdftexdir/pdftex.h \
+	pdftexdir/pdftoepdf.cc \
+	pdftexdir/pkin.c \
+	pdftexdir/ptexlib.h \
+	pdftexdir/ptexmac.h \
+	pdftexdir/subfont.c \
+	pdftexdir/tounicode.c \
+	pdftexdir/utils.c \
+	pdftexdir/vfpacket.c \
+	pdftexdir/writeenc.c \
+	pdftexdir/writefont.c \
+	pdftexdir/writeimg.c \
+	pdftexdir/writejbig2.c \
+	pdftexdir/writejbig2.h \
+	pdftexdir/writejpg.c \
+	pdftexdir/writepng.c \
+	pdftexdir/writet1.c \
+	pdftexdir/writet3.c \
+	pdftexdir/writettf.c \
+	pdftexdir/writettf.h \
+	pdftexdir/writezip.c
+
+if MINGW32
+libpdftex_a_SOURCES += \
+	pdftexdir/regex/regex.c \
+	pdftexdir/regex/regex.h
+endif MINGW32
+
+## We must create pdftexd.h before building the libpdftex_a_OBJECTS.
+$(libpdftex_a_OBJECTS): pdftexd.h
+
+## included by pdftexdir/writettf.c
+EXTRA_libpdftex_a_SOURCES = pdftexdir/macnames.c
+
+## included by pdftexdir/regex/regex.c
+EXTRA_libpdftex_a_SOURCES += \
+	pdftexdir/regex/regcomp.c \
+	pdftexdir/regex/regex_internal.c \
+	pdftexdir/regex/regex_internal.h \
+	pdftexdir/regex/regexec.c
+
+EXTRA_DIST += \
+	pdftexdir/regex/COPYING.LIB \
+	pdftexdir/regex/README
diff --git a/Build/source/texk/web2c/pdftexdir/am/pdftex.am b/Build/source/texk/web2c/pdftexdir/am/pdftex.am
index b4caa4323bb..808103ed721 100644
--- a/Build/source/texk/web2c/pdftexdir/am/pdftex.am
+++ b/Build/source/texk/web2c/pdftexdir/am/pdftex.am
@@ -25,7 +25,8 @@ pdf_tangle = WEBINPUTS=.:$(srcdir)/pdftexdir $(buildenv) $(TANGLE)
 
 pdftex_CPPFLAGS = $(pdftex_cppflags)
 
-pdftex_LDADD = $(pdftex_ldadd) $(LDADD) $(socketlibs)
+## With --enable-ipc, pdfTeX may need to link with -lsocket.
+pdftex_LDADD = $(pdftex_ldadd) $(LDADD) $(ipc_socketlibs)
 
 pdftex_DEPENDENCIES = $(pdftex_dependencies) libpdftex.a
 
@@ -71,95 +72,11 @@ EXTRA_DIST += $(pdftex_ch_srcs) \
 DISTCLEANFILES += $(nodist_pdftex_SOURCES) pdftex.ch pdftex-web2c \
 	pdftex.p pdftex.pool pdftex-tangle pdftexdir/pdftex.version
 
-## ttf2afm
-##
-bin_PROGRAMS += ttf2afm
-
-ttf2afm_CPPFLAGS = -I$(srcdir)/pdftexdir 
-
-ttf2afm_SOURCES = pdftexdir/ttf2afm.c
-
-## included by pdftexdir/ttf2afm.c
-EXTRA_ttf2afm_SOURCES = pdftexdir/macnames.c
-
-## pdftosrc
-##
-bin_PROGRAMS += pdftosrc
-
-## Force Automake to use CXXLD for linking
-nodist_EXTRA_pdftosrc_SOURCES = dummy.cxx
-
-pdftosrc_CPPFLAGS = $(pdftex_cppflags)
-
-pdftosrc_SOURCES = pdftexdir/pdftosrc.cc
-
-pdftosrc_LDADD = $(pdftex_ldadd) $(LDADD)
-
-pdftosrc_DEPENDENCIES = $(pdftex_dependencies) libpdftex.a
-
-## libpdftex
-##
-EXTRA_LIBRARIES += libpdftex.a
-
-libpdftex_a_CPPFLAGS = $(pdftex_cppflags)
-
-libpdftex_a_SOURCES = \
-	pdftexdir/avl.c \
-	pdftexdir/avl.h \
-	pdftexdir/avlstuff.c \
-	pdftexdir/avlstuff.h \
-	pdftexdir/epdf.c \
-	pdftexdir/epdf.h \
-	pdftexdir/image.h \
-	pdftexdir/mapfile.c \
-	pdftexdir/pdftex.h \
-	pdftexdir/pdftoepdf.cc \
-	pdftexdir/pkin.c \
-	pdftexdir/ptexlib.h \
-	pdftexdir/ptexmac.h \
-	pdftexdir/subfont.c \
-	pdftexdir/tounicode.c \
-	pdftexdir/utils.c \
-	pdftexdir/vfpacket.c \
-	pdftexdir/writeenc.c \
-	pdftexdir/writefont.c \
-	pdftexdir/writeimg.c \
-	pdftexdir/writejbig2.c \
-	pdftexdir/writejbig2.h \
-	pdftexdir/writejpg.c \
-	pdftexdir/writepng.c \
-	pdftexdir/writet1.c \
-	pdftexdir/writet3.c \
-	pdftexdir/writettf.c \
-	pdftexdir/writettf.h \
-	pdftexdir/writezip.c
-
-if MINGW32
-libpdftex_a_SOURCES += \
-	pdftexdir/regex/regex.c \
-	pdftexdir/regex/regex.h
-endif MINGW32
-
-## We must create pdftexd.h before building the libpdftex_a_OBJECTS.
-$(libpdftex_a_OBJECTS): pdftexd.h
-
-## included by pdftexdir/writettf.c
-EXTRA_libpdftex_a_SOURCES = pdftexdir/macnames.c
-
-## included by pdftexdir/regex/regex.c
-EXTRA_libpdftex_a_SOURCES += \
-	pdftexdir/regex/regcomp.c \
-	pdftexdir/regex/regex_internal.c \
-	pdftexdir/regex/regex_internal.h \
-	pdftexdir/regex/regexec.c
-
 EXTRA_DIST += \
 	pdftexdir/ChangeLog \
 	pdftexdir/NEWS \
 	pdftexdir/README \
-	pdftexdir/change-files.txt \
-	pdftexdir/regex/COPYING.LIB \
-	pdftexdir/regex/README
+	pdftexdir/change-files.txt
 
 ## Not used
 ##
diff --git a/Build/source/texk/web2c/pdftexdir/am/pdftosrc.am b/Build/source/texk/web2c/pdftexdir/am/pdftosrc.am
new file mode 100644
index 00000000000..039589db40f
--- /dev/null
+++ b/Build/source/texk/web2c/pdftexdir/am/pdftosrc.am
@@ -0,0 +1,16 @@
+## texk/web2c/pdftexdir/am/pdftosrc.am: Makefile fragment for pdftosrc.
+
+## pdftosrc
+##
+bin_PROGRAMS += pdftosrc
+
+## Force Automake to use CXXLD for linking
+nodist_EXTRA_pdftosrc_SOURCES = dummy.cxx
+
+pdftosrc_CPPFLAGS = $(pdftex_cppflags)
+
+pdftosrc_SOURCES = pdftexdir/pdftosrc.cc
+
+pdftosrc_LDADD = $(pdftex_ldadd) $(LDADD)
+
+pdftosrc_DEPENDENCIES = $(pdftex_dependencies) libpdftex.a
diff --git a/Build/source/texk/web2c/pdftexdir/am/ttf2afm.am b/Build/source/texk/web2c/pdftexdir/am/ttf2afm.am
new file mode 100644
index 00000000000..0382bd5ae63
--- /dev/null
+++ b/Build/source/texk/web2c/pdftexdir/am/ttf2afm.am
@@ -0,0 +1,12 @@
+## texk/web2c/pdftexdir/am/ttf2afm.am: Makefile fragment for ttf2afm.
+
+## ttf2afm
+##
+bin_PROGRAMS += ttf2afm
+
+ttf2afm_CPPFLAGS = -I$(srcdir)/pdftexdir 
+
+ttf2afm_SOURCES = pdftexdir/ttf2afm.c
+
+## included by pdftexdir/ttf2afm.c
+EXTRA_ttf2afm_SOURCES = pdftexdir/macnames.c