Build and install WIN32/MINGW32 wrapper binaries

   where Unix uses symlinks such as dvilj6->dvilj4

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

3 files changed, 53 insertions, 10 deletions

diff --git a/Build/source/texk/dviljk/ChangeLog b/Build/source/texk/dviljk/ChangeLog
index 7ca16bbde81..94db9765151 100644
--- a/Build/source/texk/dviljk/ChangeLog
+++ b/Build/source/texk/dviljk/ChangeLog
@@ -1,3 +1,7 @@
+2011-02-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am [WIN32]: Add dvilj6.exe wrapper.
+
 2011-02-08  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am: Use ../am/man1_links.am for manpage links.
diff --git a/Build/source/texk/dviljk/Makefile.am b/Build/source/texk/dviljk/Makefile.am
index 58ee1dd8476..5db79bef48a 100644
--- a/Build/source/texk/dviljk/Makefile.am
+++ b/Build/source/texk/dviljk/Makefile.am
@@ -17,12 +17,14 @@ libdvilj_a_SOURCES = \
 
 $(libdvilj_a_OBJECTS): $(KPATHSEA_DEPEND)
 
-if !WIN32
+bin_PROGRAMS = dvilj dvilj2p dvilj4 dvilj4l
+
+if WIN32
+bin_PROGRAMS += dvilj6
+else !WIN32
 dist_bin_SCRIPTS = dvihp
 endif !WIN32
 
-bin_PROGRAMS = dvilj dvilj2p dvilj4 dvilj4l
-
 dvilj_CPPFLAGS = -DKPATHSEA -DLJ
 
 dvilj_SOURCES = \
@@ -65,6 +67,12 @@ $(dvilj4l_OBJECTS): libdvilj.a
 
 LDADD = libdvilj.a $(KPATHSEA_LIBS)	
 
+dvilj6_CPPFLAGS = -DEXEPROG=\"dvilj4.exe\"
+
+dvilj6_SOURCES = $(srcdir)/../texlive/w32_wrapper/callexe.c
+
+dvilj6_LDADD =
+
 ## Rebuild libkpathsea
 @KPATHSEA_RULE@
 
@@ -80,14 +88,18 @@ man1_links = \
 include $(top_srcdir)/../am/man1_links.am
 
 install-exec-hook:
+if !WIN32
 	cd $(DESTDIR)$(bindir) && \
 	  rm -f dvilj6$(EXEEXT) && \
 	  $(LN_S) dvilj4$(EXEEXT) dvilj6$(EXEEXT)
+endif !WIN32
 
 install-data-hook: install-man1-links
 
 uninstall-hook: uninstall-man1-links
+if !WIN32
 	rm -f $(DESTDIR)$(bindir)/dvilj6$(EXEEXT)
+endif !WIN32
 
 VERSION = `grep 'define VERSION' $(srcdir)/dvi2xx.c | sed -e 's/^.*version //' -e 's/).*//'`
 if MAINTAINER_MODE
diff --git a/Build/source/texk/dviljk/Makefile.in b/Build/source/texk/dviljk/Makefile.in
index 82a3d80c15b..ca5075eadb9 100644
--- a/Build/source/texk/dviljk/Makefile.in
+++ b/Build/source/texk/dviljk/Makefile.in
@@ -37,7 +37,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = dvilj$(EXEEXT) dvilj2p$(EXEEXT) dvilj4$(EXEEXT) \
-	dvilj4l$(EXEEXT)
+	dvilj4l$(EXEEXT) $(am__EXEEXT_1)
+@WIN32_TRUE@am__append_1 = dvilj6
 DIST_COMMON = README $(am__configure_deps) \
 	$(am__dist_bin_SCRIPTS_DIST) $(dist_man1_MANS) \
 	$(srcdir)/../../build-aux/config.guess \
@@ -79,6 +80,7 @@ libdvilj_a_AR = $(AR) $(ARFLAGS)
 libdvilj_a_LIBADD =
 am_libdvilj_a_OBJECTS = tfm.$(OBJEXT)
 libdvilj_a_OBJECTS = $(am_libdvilj_a_OBJECTS)
+@WIN32_TRUE@am__EXEEXT_1 = dvilj6$(EXEEXT)
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
 	"$(DESTDIR)$(man1dir)"
 PROGRAMS = $(bin_PROGRAMS)
@@ -99,6 +101,9 @@ am_dvilj4l_OBJECTS = dvilj4l-dvi2xx.$(OBJEXT)
 dvilj4l_OBJECTS = $(am_dvilj4l_OBJECTS)
 dvilj4l_LDADD = $(LDADD)
 dvilj4l_DEPENDENCIES = libdvilj.a $(am__DEPENDENCIES_1)
+am_dvilj6_OBJECTS = dvilj6-callexe.$(OBJEXT)
+dvilj6_OBJECTS = $(am_dvilj6_OBJECTS)
+dvilj6_DEPENDENCIES =
 am__dist_bin_SCRIPTS_DIST = dvihp
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
@@ -136,9 +141,10 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
 SOURCES = $(libdvilj_a_SOURCES) $(dvilj_SOURCES) $(dvilj2p_SOURCES) \
-	$(dvilj4_SOURCES) $(dvilj4l_SOURCES)
+	$(dvilj4_SOURCES) $(dvilj4l_SOURCES) $(dvilj6_SOURCES)
 DIST_SOURCES = $(libdvilj_a_SOURCES) $(dvilj_SOURCES) \
-	$(dvilj2p_SOURCES) $(dvilj4_SOURCES) $(dvilj4l_SOURCES)
+	$(dvilj2p_SOURCES) $(dvilj4_SOURCES) $(dvilj4l_SOURCES) \
+	$(dvilj6_SOURCES)
 man1dir = $(mandir)/man1
 NROFF = nroff
 MANS = $(dist_man1_MANS)
@@ -313,6 +319,9 @@ dvilj4l_SOURCES = \
 	dvi2xx.h
 
 LDADD = libdvilj.a $(KPATHSEA_LIBS)	
+dvilj6_CPPFLAGS = -DEXEPROG=\"dvilj4.exe\"
+dvilj6_SOURCES = $(srcdir)/../texlive/w32_wrapper/callexe.c
+dvilj6_LDADD = 
 dist_man1_MANS = dvihp.man dvilj.man
 
 # Symlinks within $(man1dir): FILE:LINK indicates LINK.1->FILE.1
@@ -442,6 +451,9 @@ dvilj4$(EXEEXT): $(dvilj4_OBJECTS) $(dvilj4_DEPENDENCIES)
 dvilj4l$(EXEEXT): $(dvilj4l_OBJECTS) $(dvilj4l_DEPENDENCIES) 
 	@rm -f dvilj4l$(EXEEXT)
 	$(LINK) $(dvilj4l_OBJECTS) $(dvilj4l_LDADD) $(LIBS)
+dvilj6$(EXEEXT): $(dvilj6_OBJECTS) $(dvilj6_DEPENDENCIES) 
+	@rm -f dvilj6$(EXEEXT)
+	$(LINK) $(dvilj6_OBJECTS) $(dvilj6_LDADD) $(LIBS)
 install-dist_binSCRIPTS: $(dist_bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
 	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@@ -487,6 +499,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dvilj2p-dvi2xx.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dvilj4-dvi2xx.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dvilj4l-dvi2xx.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dvilj6-callexe.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tfm.Po@am__quote@
 
 .c.o:
@@ -566,6 +579,20 @@ dvilj4l-dvi2xx.obj: dvi2xx.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dvilj4l_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dvilj4l-dvi2xx.obj `if test -f 'dvi2xx.c'; then $(CYGPATH_W) 'dvi2xx.c'; else $(CYGPATH_W) '$(srcdir)/dvi2xx.c'; fi`
 
+dvilj6-callexe.o: $(srcdir)/../texlive/w32_wrapper/callexe.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dvilj6_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dvilj6-callexe.o -MD -MP -MF $(DEPDIR)/dvilj6-callexe.Tpo -c -o dvilj6-callexe.o `test -f '$(srcdir)/../texlive/w32_wrapper/callexe.c' || echo '$(srcdir)/'`$(srcdir)/../texlive/w32_wrapper/callexe.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/dvilj6-callexe.Tpo $(DEPDIR)/dvilj6-callexe.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/../texlive/w32_wrapper/callexe.c' object='dvilj6-callexe.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dvilj6_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dvilj6-callexe.o `test -f '$(srcdir)/../texlive/w32_wrapper/callexe.c' || echo '$(srcdir)/'`$(srcdir)/../texlive/w32_wrapper/callexe.c
+
+dvilj6-callexe.obj: $(srcdir)/../texlive/w32_wrapper/callexe.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dvilj6_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dvilj6-callexe.obj -MD -MP -MF $(DEPDIR)/dvilj6-callexe.Tpo -c -o dvilj6-callexe.obj `if test -f '$(srcdir)/../texlive/w32_wrapper/callexe.c'; then $(CYGPATH_W) '$(srcdir)/../texlive/w32_wrapper/callexe.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../texlive/w32_wrapper/callexe.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/dvilj6-callexe.Tpo $(DEPDIR)/dvilj6-callexe.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/../texlive/w32_wrapper/callexe.c' object='dvilj6-callexe.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dvilj6_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dvilj6-callexe.obj `if test -f '$(srcdir)/../texlive/w32_wrapper/callexe.c'; then $(CYGPATH_W) '$(srcdir)/../texlive/w32_wrapper/callexe.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../texlive/w32_wrapper/callexe.c'; fi`
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
@@ -988,14 +1015,14 @@ uninstall-man1-links:
 	done
 
 install-exec-hook:
-	cd $(DESTDIR)$(bindir) && \
-	  rm -f dvilj6$(EXEEXT) && \
-	  $(LN_S) dvilj4$(EXEEXT) dvilj6$(EXEEXT)
+@WIN32_FALSE@	cd $(DESTDIR)$(bindir) && \
+@WIN32_FALSE@	  rm -f dvilj6$(EXEEXT) && \
+@WIN32_FALSE@	  $(LN_S) dvilj4$(EXEEXT) dvilj6$(EXEEXT)
 
 install-data-hook: install-man1-links
 
 uninstall-hook: uninstall-man1-links
-	rm -f $(DESTDIR)$(bindir)/dvilj6$(EXEEXT)
+@WIN32_FALSE@	rm -f $(DESTDIR)$(bindir)/dvilj6$(EXEEXT)
 @MAINTAINER_MODE_TRUE@dvilj.man: dvilj.pod dvi2xx.c
 @MAINTAINER_MODE_TRUE@	pod2man --center="TeX-Live" --release="Version $(VERSION)" $< >$@
 dvilj.ps: dvilj.man