From 120a98edd7122022d099068f80cd8edaf499853d Mon Sep 17 00:00:00 2001 From: Taco Hoekwater Date: Tue, 1 Jul 2008 09:22:39 +0000 Subject: [PATCH] mpxout belongs to mpost, not the core library git-svn-id: svn+ssh://scm.foundry.supelec.fr/svn/metapost/mplib/trunk@586 b0617d17-b707-0410-b22c-fd2634e05cc4 --- src/texk/web2c/mpdir/Makefile.am | 4 ++-- src/texk/web2c/mpdir/Makefile.in | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/texk/web2c/mpdir/Makefile.am b/src/texk/web2c/mpdir/Makefile.am index 2110f44..2a68265 100644 --- a/src/texk/web2c/mpdir/Makefile.am +++ b/src/texk/web2c/mpdir/Makefile.am @@ -22,12 +22,12 @@ CFLAGS=-Wall -W -g -I. -I../.. -I$(KPSESRCDIR)/.. bin_PROGRAMS = mpost -mpost_SOURCES = mpost.c +mpost_SOURCES = mpost.c mpxout.c mpost_DEPENDENCIES = libmplib.a mpost_LDADD = libmplib.a $(KPSELIB) -lm noinst_LIBRARIES = libmplib.a -libmplib_a_SOURCES = avl.c mp.c psout.c mpxout.c +libmplib_a_SOURCES = avl.c mp.c psout.c include_HEADERS = mplib.h diff --git a/src/texk/web2c/mpdir/Makefile.in b/src/texk/web2c/mpdir/Makefile.in index c289e5b..5341049 100644 --- a/src/texk/web2c/mpdir/Makefile.in +++ b/src/texk/web2c/mpdir/Makefile.in @@ -68,13 +68,12 @@ LIBRARIES = $(noinst_LIBRARIES) ARFLAGS = cru libmplib_a_AR = $(AR) $(ARFLAGS) libmplib_a_LIBADD = -am_libmplib_a_OBJECTS = avl.$(OBJEXT) mp.$(OBJEXT) psout.$(OBJEXT) \ - mpxout.$(OBJEXT) +am_libmplib_a_OBJECTS = avl.$(OBJEXT) mp.$(OBJEXT) psout.$(OBJEXT) libmplib_a_OBJECTS = $(am_libmplib_a_OBJECTS) am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includedir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) -am_mpost_OBJECTS = mpost.$(OBJEXT) +am_mpost_OBJECTS = mpost.$(OBJEXT) mpxout.$(OBJEXT) mpost_OBJECTS = $(am_mpost_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp @@ -221,11 +220,11 @@ AUTOMAKE_OPTIONS = foreign KPSEBUILDDIR = ../../../texk/kpathsea/.libs KPSESRCDIR = ../../../../src/texk/kpathsea KPSELIB = $(KPSEBUILDDIR)/libkpathsea.a -mpost_SOURCES = mpost.c +mpost_SOURCES = mpost.c mpxout.c mpost_DEPENDENCIES = libmplib.a mpost_LDADD = libmplib.a $(KPSELIB) -lm noinst_LIBRARIES = libmplib.a -libmplib_a_SOURCES = avl.c mp.c psout.c mpxout.c +libmplib_a_SOURCES = avl.c mp.c psout.c include_HEADERS = mplib.h CTANGLE = ctangle all: config.h -- 2.32.0.93.g670b81a890