Install symbolic links initex->tex and inimf->mf

Use AM_CFLAGS instead of program specific *-CFLAGS

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

3 files changed, 20 insertions, 10 deletions

diff --git a/Build/source/texk/web2c/am/bootstrap.am b/Build/source/texk/web2c/am/bootstrap.am
index 0b9a3036732..bf166527a0d 100644
--- a/Build/source/texk/web2c/am/bootstrap.am
+++ b/Build/source/texk/web2c/am/bootstrap.am
@@ -1,6 +1,6 @@
 ## texk/web2c/am/bootstrap.am: Makefile fragment for tangle and ctangle.
 ##
-## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009 - 2010 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 
 # Bootstrapping tangle requires making it with itself.  We use the opportunity
@@ -49,7 +49,6 @@ DISTCLEANFILES += tangleboot.c tangleboot.h tangleboot.p tangleboot-web2c
 bin_PROGRAMS += ctangle
 nodist_ctangle_SOURCES = ctangle.c cweb.c
 $(ctangle_OBJECTS): cweb.h
-ctangle_CFLAGS = $(WARNING_CFLAGS)
 # ctangle.c and cweb.[ch] are special cases, since they are needed to compile
 # themselves.  We depend on ctangleboot, even though we might not use it.
 ctangleboot = $(SHELL) ./ctangleboot-sh $@
diff --git a/Build/source/texk/web2c/am/cweb.am b/Build/source/texk/web2c/am/cweb.am
index cba361919ce..0f8534bd8c2 100644
--- a/Build/source/texk/web2c/am/cweb.am
+++ b/Build/source/texk/web2c/am/cweb.am
@@ -1,13 +1,12 @@
 ## texk/web2c/am/cweb.am: Makefile fragment for cweb programs (except ctangle).
 ##
-## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 
 bin_PROGRAMS += ctie cweave tie
 EXTRA_DIST += ctiedir tiedir
 
 nodist_ctie_SOURCES = ctie.c
-ctie_CFLAGS = $(WARNING_CFLAGS)
 ## We install man/ctie.man, not ctiedir/ctie.1
 ## nodist_man_MANS += ctiedir/ctie.1
 ctie.c: ctangle$(EXEEXT) ctiedir/ctie.w ctiedir/ctie-k.ch
@@ -16,14 +15,12 @@ DISTCLEANFILES += ctie.c
 
 nodist_cweave_SOURCES = cweave.c cweb.c
 $(cweave_OBJECTS): cweb.h
-cweave_CFLAGS = $(WARNING_CFLAGS)
 cweave.c: ctangle$(EXEEXT) cwebdir/common.h cwebdir/cweave.w cwebdir/prod.w cwebdir/cweav-w2c.ch
 	CWEBINPUTS=$(srcdir)/cwebdir $(ctangle) cweave cweav-w2c
 DISTCLEANFILES += cweave.c
 
 nodist_tie_SOURCES = tie.c
 tie_CPPFLAGS = $(AM_CPPFLAGS) -DNOT_WEB2C
-tie_CFLAGS = $(WARNING_CFLAGS)
 ## We install man/tie.man, not tiedir/tie.1
 ## nodist_man_MANS += tiedir/tie.1
 tie.c: ctangle$(EXEEXT) tiedir/tie.w tiedir/tie-w2c.ch
diff --git a/Build/source/texk/web2c/am/texmf.am b/Build/source/texk/web2c/am/texmf.am
index 74c8338b91d..8df06010c84 100644
--- a/Build/source/texk/web2c/am/texmf.am
+++ b/Build/source/texk/web2c/am/texmf.am
@@ -16,11 +16,19 @@ EXTRA_DIST += \
 ##
 if TEX
 bin_PROGRAMS += tex
+if WIN32
+bin_PROGRAMS += initex
+else !WIN32
+bin_links += tex:initex
+endif !WIN32
 endif TEX
 EXTRA_PROGRAMS += tex
 
+initex_CPPFLAGS = -DEXEPROG=\"tex.exe\"
+initex_SOURCES = $(srcdir)/../texlive/w32_wrapper/callexe.c
+initex_LDADD =
+
 tex_CPPFLAGS = $(AM_CPPFLAGS)
-tex_CFLAGS = $(WARNING_CFLAGS)
 
 # With --enable-ipc, TeX may need to link with -lsocket.
 tex_LDADD = $(LDADD) $(ipc_socketlibs)
@@ -92,17 +100,24 @@ bin_PROGRAMS += mf
 if MFN
 bin_PROGRAMS += mf-nowin
 endif MFN
+if WIN32
+bin_PROGRAMS += inimf
+else !WIN32
+bin_links += mf:inimf
+endif !WIN32
 endif MF
 EXTRA_PROGRAMS += mf mf-nowin
 DISTCLEANFILES += mftrap.diffs
 
+inimf_CPPFLAGS = -DEXEPROG=\"mf.exe\"
+inimf_SOURCES = $(srcdir)/../texlive/w32_wrapper/callexe.c
+inimf_LDADD =
+
 dist_mf_SOURCES = mfextra.c
 mf_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS)
-mf_CFLAGS = $(WARNING_CFLAGS)
 mf_LDADD = libmf.a $(LDADD) $(windowlib) $(mf_x_libs)
 dist_mf_nowin_SOURCES = mfextra.c
 mf_nowin_CPPFLAGS = $(mf_CPPFLAGS) -DMFNOWIN
-mf_nowin_CFLAGS = $(WARNING_CFLAGS)
 mf_nowin_LDADD = libmf.a $(LDADD) $(windowlib)
 
 # We must create mfd.h before compiling mfextra.c.
@@ -132,7 +147,6 @@ EXTRA_LIBRARIES += libmf.a
 # Metafont C sources
 mf_c_h = mfini.c mf0.c mfcoerce.h mfd.h
 nodist_libmf_a_SOURCES = $(mf_c_h) mf-pool.c
-libmf_a_CFLAGS = $(WARNING_CFLAGS)
 
 # We must create mfd.h before building the libmf_a_OBJECTS.
 $(libmf_a_OBJECTS): mfd.h