diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-02-22 12:09:38 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-02-22 12:09:38 +0000 |
commit | b287d7f6a13823ea17e0bd415981d3a5953ca703 (patch) | |
tree | a420b28a35f7761f064d50bb610dbb2b46c71486 /Build/source/texk/web2c/Makefile.in | |
parent | 5fd6fd3479fcbbda52ebca7b5e80a5aaa1add69f (diff) |
build system: various small fixes for mingw32 cross compilation
still incomplete
git-svn-id: svn://tug.org/texlive/trunk@17141 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/Makefile.in')
-rw-r--r-- | Build/source/texk/web2c/Makefile.in | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index 31dda0d8452..feed9312c97 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -568,9 +568,10 @@ md5main_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ $(LDFLAGS) -o $@ nodist_mf_OBJECTS = mf-mfextra.$(OBJEXT) mf_OBJECTS = $(nodist_mf_OBJECTS) -am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +@WIN32_FALSE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1) \ +@WIN32_FALSE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +@WIN32_FALSE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +@WIN32_FALSE@ $(am__DEPENDENCIES_1) mf_DEPENDENCIES = libmf.a $(am__DEPENDENCIES_2) $(windowlib) \ $(am__DEPENDENCIES_5) mf_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ @@ -892,6 +893,7 @@ distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AR = @AR@ +AS = @AS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -911,6 +913,7 @@ CXXLD = @CXXLD@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -1457,7 +1460,8 @@ windowlib = window/libwindow.a # All the x_... and X_... variables will be empty if we aren't supporting X. # Follow the library order used in X11R6 itself: # -lXaw -lXmu -lXt -lSM -lICE -lXext -lX11 (some may not be present). -mf_x_libs = $(X_LIBS) $(x_tool_libs) $(X_PRE_LIBS) $(x_ext_lib) $(wlibs) $(X_EXTRA_LIBS) +@WIN32_FALSE@mf_x_libs = $(X_LIBS) $(x_tool_libs) $(X_PRE_LIBS) $(x_ext_lib) $(wlibs) $(X_EXTRA_LIBS) +@WIN32_TRUE@mf_x_libs = -lgdi32 # Metafont C sources mf_c_h = mfini.c mf0.c mfcoerce.h mfd.h |