diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-04-21 12:47:39 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-04-21 12:47:39 +0000 |
commit | 21b4be81ded3ffd6a9911d002709d718654741a2 (patch) | |
tree | 6be0eef9a7e06696a62fc48571c8ccb3565a1c0d /Build/source/texk/web2c/mplibdir | |
parent | b77e78eaf3652b80e78ae80f770bd3bdf721363d (diff) |
new build system: better texk/web2c/ dependencies, rename mpost->oldmpost and newmpost->mpost
git-svn-id: svn://tug.org/texlive/trunk@12772 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/mplibdir')
-rw-r--r-- | Build/source/texk/web2c/mplibdir/am/libmplib.am | 54 | ||||
-rw-r--r-- | Build/source/texk/web2c/mplibdir/am/mplib.am | 67 |
2 files changed, 76 insertions, 45 deletions
diff --git a/Build/source/texk/web2c/mplibdir/am/libmplib.am b/Build/source/texk/web2c/mplibdir/am/libmplib.am new file mode 100644 index 00000000000..491054dadfe --- /dev/null +++ b/Build/source/texk/web2c/mplibdir/am/libmplib.am @@ -0,0 +1,54 @@ +## texk/web2c/mplibdir/am/libmplib.am: Makefile fragment for libmplib. + +## libmplib.a, used by MetaPost and luaTeX +## +EXTRA_LIBRARIES += libmplib.a + +libmplib_a_CPPFLAGS = -I$(srcdir)/mplibdir + +## libmplib C sources +libmplib_a_SOURCES = mplibdir/avl.h mplibdir/avl.c +nodist_libmplib_a_SOURCES = memio.c tfmin.c +nodist_libmplib_a_SOURCES += $(mp_c_h) $(psout_c_h) $(svgout_c_h) +mp_c_h = mp.c mplib.h mpmp.h +psout_c_h = mppsout.h psout.c mplibps.h +svgout_c_h = mplibsvg.h mpsvgout.h svgout.c + +memio.c: ctangle$(EXEEXT) mplibdir/memio.w + $(mp_ctangle) memio.w + +tfmin.c: ctangle$(EXEEXT) mplibdir/tfmin.w + $(mp_ctangle) tfmin.w + +$(mp_c_h): mp-ctangle +mp-ctangle: ctangle$(EXEEXT) mplibdir/mp.w + $(mp_ctangle) mp.w + echo timestamp >$@ + touch $(mp_c_h) + +$(psout_c_h): psout-ctangle +psout-ctangle: ctangle$(EXEEXT) mplibdir/psout.w + $(mp_ctangle) psout.w + echo timestamp >$@ + touch $(psout_c_h) + +$(svgout_c_h): svgout-ctangle +svgout-ctangle: ctangle$(EXEEXT) mplibdir/svgout.w + $(mp_ctangle) svgout.w + echo timestamp >$@ + touch $(svgout_c_h) + +## libmplib CWeb sources +libmplib_web = mplibdir/mp.w mplibdir/psout.w mplibdir/svgout.w +libmplib_web += mplibdir/memio.w mplibdir/tfmin.w + +$(libmplib_a_OBJECTS): $(nodist_libmplib_a_SOURCES) + +EXTRA_DIST += $(libmplib_web) + +DISTCLEANFILES += $(nodist_libmplib_a_SOURCES) \ + mp-ctangle psout-ctangle svgout-ctangle + +## only used by luaTeX +EXTRA_DIST += mplibdir/lmplib.c + diff --git a/Build/source/texk/web2c/mplibdir/am/mplib.am b/Build/source/texk/web2c/mplibdir/am/mplib.am index 26414bf8dfe..3256bc925c3 100644 --- a/Build/source/texk/web2c/mplibdir/am/mplib.am +++ b/Build/source/texk/web2c/mplibdir/am/mplib.am @@ -1,60 +1,37 @@ ## texk/web2c/mplibdir/am/mplib.am: Makefile fragment for MetaPost. -## metapost +## MetaPost ## if MP -bin_PROGRAMS += newmpost +bin_PROGRAMS += mpost endif MP -EXTRA_PROGRAMS += newmpost +EXTRA_PROGRAMS += mpost -EXTRA_LIBRARIES += libmplib.a +mp_ctangle = CWEBINPUTS=$(srcdir)/mplibdir $(ctangle) -newmpost_c_h = mpost.c mpxout.c mpxout.h -newmpost_web = mplibdir/mpost.w mplibdir/mpxout.w +mpost_CPPFLAGS = -I$(srcdir)/mplibdir +mpost_DEPENDENCIES = libmplib.a +mpost_LDADD = libmplib.a $(KPATHSEA_LIBS) -lm -EXTRA_DIST += $(newmpost_web) +## MetaPost C sources +nodist_mpost_SOURCES = mpost.c $(mpxout_c_h) +mpxout_c_h = mpxout.c mpxout.h -newmpost_CPPFLAGS = -I$(srcdir)/mplibdir -newmpost_DEPENDENCIES = libmplib.a -newmpost_LDADD = libmplib.a $(KPATHSEA_LIBS) -lm -nodist_newmpost_SOURCES = $(newmpost_c_h) +mpost.c: ctangle$(EXEEXT) mplibdir/mpost.w + $(mp_ctangle) mpost.w -$(newmpost_c_h): mpost-ctangle libmplib.a -mpost-ctangle: ctangle$(EXEEXT) $(newmpost_web) - CWEBINPUTS=$(srcdir)/mplibdir $(ctangle) mpost.w - CWEBINPUTS=$(srcdir)/mplibdir $(ctangle) mpxout.w +$(mpxout_c_h): mpxout-ctangle +mpxout-ctangle: ctangle$(EXEEXT) mplibdir/mpxout.w + $(mp_ctangle) mpxout.w echo timestamp >$@ - touch $(newmpost_c_h) - -DISTCLEANFILES += $(newmpost_c_h) mpost-ctangle - -## These files are mutually dependent -libmplib_c_h = mp.c mplib.h mpmp.h -libmplib_c_h += mppsout.h psout.c mplibps.h -libmplib_c_h += mplibsvg.h mpsvgout.h svgout.c -libmplib_c_h += memio.c tfmin.c -libmplib_true_c = mplibdir/avl.h mplibdir/avl.c -libmplib_web = $(libmplib_true_c) mplibdir/mp.w mplibdir/psout.w -libmplib_web += mplibdir/svgout.w mplibdir/memio.w mplibdir/tfmin.w - -libmplib_a_CPPFLAGS = -I$(srcdir)/mplibdir -nodist_libmplib_a_SOURCES = $(libmplib_c_h) -libmplib_a_SOURCES = $(libmplib_true_c) - -$(libmplib_c_h): mplib-ctangle $(libmplib_true_c) -mplib-ctangle: ctangle$(EXEEXT) $(libmplib_web) - CWEBINPUTS=$(srcdir)/mplibdir $(ctangle) mp.w - CWEBINPUTS=$(srcdir)/mplibdir $(ctangle) psout.w - CWEBINPUTS=$(srcdir)/mplibdir $(ctangle) svgout.w - CWEBINPUTS=$(srcdir)/mplibdir $(ctangle) tfmin.w - CWEBINPUTS=$(srcdir)/mplibdir $(ctangle) memio.w - echo timestamp >$@ - touch $(libmplib_c_h) + touch $(mpxout_c_h) + +## MetaPost CWeb sources +mpost_web = mplibdir/mpost.w mplibdir/mpxout.w -EXTRA_DIST += $(libmplib_web) +$(mpost_OBJECTS): $(nodist_mpost_SOURCES) libmplib.a -DISTCLEANFILES += $(libmplib_c_h) mplib-ctangle +EXTRA_DIST += $(mpost_web) -## only used by luatex, perhaps should not be mentioned here -EXTRA_DIST += mplibdir/lmplib.c +DISTCLEANFILES += $(nodist_mpost_SOURCES) mpxout-ctangle |