diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-06-10 13:18:47 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-06-10 13:18:47 +0000 |
commit | 5af1aa3cd449e5a6abb4972dcd9090bbe61162de (patch) | |
tree | cb4e4668b85d773dbb9ed7019ea250488a760948 /Build/source/texk/web2c/am | |
parent | 3afa3f06a4c3c3750742e7a6db8f20314c53183a (diff) |
texk/web2c: reorganize headers and CPPFLAGS
git-svn-id: svn://tug.org/texlive/trunk@18865 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/am')
-rw-r--r-- | Build/source/texk/web2c/am/cweb.am | 2 | ||||
-rw-r--r-- | Build/source/texk/web2c/am/texmf.am | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Build/source/texk/web2c/am/cweb.am b/Build/source/texk/web2c/am/cweb.am index f7674eef57b..cba361919ce 100644 --- a/Build/source/texk/web2c/am/cweb.am +++ b/Build/source/texk/web2c/am/cweb.am @@ -22,7 +22,7 @@ cweave.c: ctangle$(EXEEXT) cwebdir/common.h cwebdir/cweave.w cwebdir/prod.w cweb DISTCLEANFILES += cweave.c nodist_tie_SOURCES = tie.c -tie_CPPFLAGS = -DNOT_WEB2C +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 diff --git a/Build/source/texk/web2c/am/texmf.am b/Build/source/texk/web2c/am/texmf.am index b88acb3707e..7c16c38e6f8 100644 --- a/Build/source/texk/web2c/am/texmf.am +++ b/Build/source/texk/web2c/am/texmf.am @@ -19,7 +19,7 @@ bin_PROGRAMS += tex endif TEX EXTRA_PROGRAMS += tex -tex_CPPFLAGS = +tex_CPPFLAGS = $(AM_CPPFLAGS) tex_CFLAGS = $(WARNING_CFLAGS) # With --enable-ipc, TeX may need to link with -lsocket. @@ -97,11 +97,11 @@ EXTRA_PROGRAMS += mf mf-nowin DISTCLEANFILES += mftrap.diffs nodist_mf_SOURCES = mfextra.c -mf_CPPFLAGS = $(X_CFLAGS) +mf_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) mf_CFLAGS = $(WARNING_CFLAGS) mf_LDADD = libmf.a $(LDADD) $(windowlib) $(mf_x_libs) nodist_mf_nowin_SOURCES = mfextra.c -mf_nowin_CPPFLAGS = $(X_CFLAGS) -DMFNOWIN +mf_nowin_CPPFLAGS = $(mf_CPPFLAGS) -DMFNOWIN mf_nowin_CFLAGS = $(WARNING_CFLAGS) mf_nowin_LDADD = libmf.a $(LDADD) $(windowlib) |