summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvipsk
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2009-04-28 08:56:01 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2009-04-28 08:56:01 +0000
commitfd52faff2d89c990d952356d440fb8624fb54d6f (patch)
tree4d01e51cb60b9909a183939c7462a3129289bed8 /Build/source/texk/dvipsk
parenta83875d097d98b2265fdfaa570b8a55628161ed1 (diff)
fix various build problems: -lsocket, -liconv, foo.exe vs. foo
git-svn-id: svn://tug.org/texlive/trunk@12834 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipsk')
-rw-r--r--Build/source/texk/dvipsk/Makefile.am20
-rw-r--r--Build/source/texk/dvipsk/Makefile.in12
-rw-r--r--Build/source/texk/dvipsk/squeeze/Makefile.am11
-rw-r--r--Build/source/texk/dvipsk/squeeze/Makefile.in10
4 files changed, 42 insertions, 11 deletions
diff --git a/Build/source/texk/dvipsk/Makefile.am b/Build/source/texk/dvipsk/Makefile.am
index 74f24361d89..5ca62ec01b6 100644
--- a/Build/source/texk/dvipsk/Makefile.am
+++ b/Build/source/texk/dvipsk/Makefile.am
@@ -1,3 +1,7 @@
+## Makefile.am for the TeX Live subdirectory texk/ stamp-squeeze/
+##
+## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
##
ACLOCAL_AMFLAGS = -I ../../m4
@@ -86,16 +90,18 @@ texc.lpro: texc.script tex.lpro
SUFFIXES = .pro .lpro
-## The `t[mp]-' business is so that we don't create an empty .pro file,
-## if running squeeze fails for some reason. A dependency on squeeze
-## fails here, so we include it below.
+# The `t[mp]-' business is so that we don't create an empty .pro file,
+# if running squeeze fails for some reason. A dependency on squeeze
+# fails here, so we include it below.
.lpro.pro:
squeeze/squeeze <$< >t-$@ && mv t-$@ $@
-$(prologues): squeeze/squeeze$(EXEEXT)
+# When cross-compiling, EXEEXT for the build and hosts system may differ.
+# Thus we depend on the auxiliary file squeeze/stamp-squeeze.
+$(prologues): squeeze/stamp-squeeze
-squeeze/squeeze$(EXEEXT):
- cd squeeze && $(MAKE) $(AM_MAKEFLAGS)
+squeeze/stamp-squeeze:
+ cd squeeze && $(MAKE) $(AM_MAKEFLAGS) stamp-squeeze
EXTRA_DIST = $(dist_prologues) texc.script
@@ -145,7 +151,7 @@ EXTRA_DIST += \
vmcms \
vms
-## in case of an SVN repository
+# in case of an SVN repository
dist-hook:
rm -rf `find $(distdir) -name .svn`
diff --git a/Build/source/texk/dvipsk/Makefile.in b/Build/source/texk/dvipsk/Makefile.in
index 0ae6655819d..9a5e7b1c020 100644
--- a/Build/source/texk/dvipsk/Makefile.in
+++ b/Build/source/texk/dvipsk/Makefile.in
@@ -1177,13 +1177,18 @@ uninstall-man: uninstall-man1
texc.lpro: texc.script tex.lpro
$(SHELL) $(srcdir)/texc.script $(srcdir)/tex.lpro $@
+# The `t[mp]-' business is so that we don't create an empty .pro file,
+# if running squeeze fails for some reason. A dependency on squeeze
+# fails here, so we include it below.
.lpro.pro:
squeeze/squeeze <$< >t-$@ && mv t-$@ $@
-$(prologues): squeeze/squeeze$(EXEEXT)
+# When cross-compiling, EXEEXT for the build and hosts system may differ.
+# Thus we depend on the auxiliary file squeeze/stamp-squeeze.
+$(prologues): squeeze/stamp-squeeze
-squeeze/squeeze$(EXEEXT):
- cd squeeze && $(MAKE) $(AM_MAKEFLAGS)
+squeeze/stamp-squeeze:
+ cd squeeze && $(MAKE) $(AM_MAKEFLAGS) stamp-squeeze
install-data-hook:
cd $(DESTDIR)$(man1dir) && \
@@ -1197,6 +1202,7 @@ uninstall-hook:
rm -f $(DESTDIR)$(man1dir)/odvips.1
rm -f $(DESTDIR)$(bindir)/odvips
+# in case of an SVN repository
dist-hook:
rm -rf `find $(distdir) -name .svn`
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/Build/source/texk/dvipsk/squeeze/Makefile.am b/Build/source/texk/dvipsk/squeeze/Makefile.am
index 6eb87efed39..48f10154c8e 100644
--- a/Build/source/texk/dvipsk/squeeze/Makefile.am
+++ b/Build/source/texk/dvipsk/squeeze/Makefile.am
@@ -1,5 +1,16 @@
+## Makefile.am for the TeX Live subdirectory texk/dvipsk/squeeze/
+##
+## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
##
ACLOCAL_AMFLAGS = -I ../../../m4
noinst_PROGRAMS = squeeze
+nodist_noinst_DATA = stamp-squeeze
+
+stamp-squeeze: squeeze$(EXEEXT)
+ echo timestamp >$@
+
+CLEANFILES = stamp-squeeze
+
diff --git a/Build/source/texk/dvipsk/squeeze/Makefile.in b/Build/source/texk/dvipsk/squeeze/Makefile.in
index 41d66c31d89..c6a79ae39d8 100644
--- a/Build/source/texk/dvipsk/squeeze/Makefile.in
+++ b/Build/source/texk/dvipsk/squeeze/Makefile.in
@@ -14,6 +14,7 @@
@SET_MAKE@
+
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -62,6 +63,7 @@ CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = squeeze.c
DIST_SOURCES = squeeze.c
+DATA = $(nodist_noinst_DATA)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -159,6 +161,8 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ../../../m4
+nodist_noinst_DATA = stamp-squeeze
+CLEANFILES = stamp-squeeze
all: all-am
.SUFFIXES:
@@ -405,7 +409,7 @@ distcleancheck: distclean
exit 1; } >&2
check-am: all-am
check: check-am
-all-am: Makefile $(PROGRAMS)
+all-am: Makefile $(PROGRAMS) $(DATA)
installdirs:
install: install-am
install-exec: install-exec-am
@@ -424,6 +428,7 @@ install-strip:
mostlyclean-generic:
clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -508,6 +513,9 @@ uninstall-am:
mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
uninstall-am
+
+stamp-squeeze: squeeze$(EXEEXT)
+ echo timestamp >$@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT: