diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-04-28 08:56:01 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-04-28 08:56:01 +0000 |
commit | fd52faff2d89c990d952356d440fb8624fb54d6f (patch) | |
tree | 4d01e51cb60b9909a183939c7462a3129289bed8 /Build/source/texk/xdvik | |
parent | a83875d097d98b2265fdfaa570b8a55628161ed1 (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/xdvik')
-rw-r--r-- | Build/source/texk/xdvik/Makefile.am | 8 | ||||
-rw-r--r-- | Build/source/texk/xdvik/Makefile.in | 8 | ||||
-rwxr-xr-x | Build/source/texk/xdvik/configure | 2 | ||||
-rw-r--r-- | Build/source/texk/xdvik/m4/xdvi-check-iconv.m4 | 2 | ||||
-rw-r--r-- | Build/source/texk/xdvik/squeeze/Makefile.am | 7 | ||||
-rw-r--r-- | Build/source/texk/xdvik/squeeze/Makefile.in | 10 |
6 files changed, 28 insertions, 9 deletions
diff --git a/Build/source/texk/xdvik/Makefile.am b/Build/source/texk/xdvik/Makefile.am index b2e7db23cc9..d8be12f2cd1 100644 --- a/Build/source/texk/xdvik/Makefile.am +++ b/Build/source/texk/xdvik/Makefile.am @@ -170,11 +170,13 @@ xdvi_bin_DEPENDENCIES = libxdvi.a $(common_dependencies) LDADD = libxdvi.a $(common_ldadd) -psheader.c: psheader.txt 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. +psheader.c: psheader.txt squeeze/stamp-squeeze squeeze/squeeze $(srcdir)/psheader.txt $@ -squeeze/squeeze$(EXEEXT): - cd squeeze && $(MAKE) $(AM_MAKEFLAGS) +squeeze/stamp-squeeze: + cd squeeze && $(MAKE) $(AM_MAKEFLAGS) stamp-squeeze EXTRA_DIST = psheader.txt CLEANFILES = psheader.c diff --git a/Build/source/texk/xdvik/Makefile.in b/Build/source/texk/xdvik/Makefile.in index 2eb425a84f2..8372b4cccbe 100644 --- a/Build/source/texk/xdvik/Makefile.in +++ b/Build/source/texk/xdvik/Makefile.in @@ -1533,11 +1533,13 @@ uninstall-man: uninstall-man1 @KPATHSEA_RULE@ @T1LIB_RULE@ -psheader.c: psheader.txt 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. +psheader.c: psheader.txt squeeze/stamp-squeeze squeeze/squeeze $(srcdir)/psheader.txt $@ -squeeze/squeeze$(EXEEXT): - cd squeeze && $(MAKE) $(AM_MAKEFLAGS) +squeeze/stamp-squeeze: + cd squeeze && $(MAKE) $(AM_MAKEFLAGS) stamp-squeeze xdvi.1: xdvi.1.in sedscript sed -f sedscript <$(srcdir)/xdvi.1.in >$@ diff --git a/Build/source/texk/xdvik/configure b/Build/source/texk/xdvik/configure index d256afdbfca..887eef3be39 100755 --- a/Build/source/texk/xdvik/configure +++ b/Build/source/texk/xdvik/configure @@ -19373,7 +19373,7 @@ fi case $ac_cv_search_iconv in no | "none required") : ;; - *) iconv_libs="-l$ac_cv_search_iconv" ;; + *) iconv_libs=$ac_cv_search_iconv ;; esac diff --git a/Build/source/texk/xdvik/m4/xdvi-check-iconv.m4 b/Build/source/texk/xdvik/m4/xdvi-check-iconv.m4 index 7ffd12bb3d3..bbe12f3cba0 100644 --- a/Build/source/texk/xdvik/m4/xdvi-check-iconv.m4 +++ b/Build/source/texk/xdvik/m4/xdvi-check-iconv.m4 @@ -32,7 +32,7 @@ LDFLAGS="$iconv_libpath $LDFLAGS" AC_SEARCH_LIBS([iconv], [iconv recode]) AS_CASE([$ac_cv_search_iconv], [no | "none required"], [:], - [iconv_libs="-l$ac_cv_search_iconv"]) + [iconv_libs=$ac_cv_search_iconv]) AC_CHECK_FUNCS([iconv]) AC_CHECK_HEADERS([iconv.h]) if test "x$ac_cv_func_iconv:$ac_cv_header_iconv_h" = xyes:yes; then diff --git a/Build/source/texk/xdvik/squeeze/Makefile.am b/Build/source/texk/xdvik/squeeze/Makefile.am index 7c96e17ddbf..d5b2561d3c4 100644 --- a/Build/source/texk/xdvik/squeeze/Makefile.am +++ b/Build/source/texk/xdvik/squeeze/Makefile.am @@ -7,3 +7,10 @@ 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/xdvik/squeeze/Makefile.in b/Build/source/texk/xdvik/squeeze/Makefile.in index 41d66c31d89..c6a79ae39d8 100644 --- a/Build/source/texk/xdvik/squeeze/Makefile.in +++ b/Build/source/texk/xdvik/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: |