From d6feeaecc599235e45a89abbb43c3591dfd28374 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Tue, 13 Apr 2010 11:34:01 +0000 Subject: build system: fix 'make dist' and 'make distcheck' git-svn-id: svn://tug.org/texlive/trunk@17838 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/makejvf/ChangeLog | 4 ++++ Build/source/texk/makejvf/Makefile | 30 ------------------------------ Build/source/texk/makejvf/Makefile.am | 8 +++++++- Build/source/texk/makejvf/Makefile.in | 6 ++++-- Build/source/texk/makejvf/Makefile.orig | 30 ++++++++++++++++++++++++++++++ Build/source/texk/makejvf/configure.ac | 2 +- 6 files changed, 46 insertions(+), 34 deletions(-) create mode 100644 Build/source/texk/makejvf/ChangeLog delete mode 100644 Build/source/texk/makejvf/Makefile create mode 100644 Build/source/texk/makejvf/Makefile.orig (limited to 'Build/source/texk/makejvf') diff --git a/Build/source/texk/makejvf/ChangeLog b/Build/source/texk/makejvf/ChangeLog new file mode 100644 index 00000000000..c7dea48b2b4 --- /dev/null +++ b/Build/source/texk/makejvf/ChangeLog @@ -0,0 +1,4 @@ +2010-04-12 Peter Breitenlohner + + * Makefile: Renamed => Makefile.orig. + * Makefile.am (EXTRA_DIST): Add Makefile.orig. diff --git a/Build/source/texk/makejvf/Makefile b/Build/source/texk/makejvf/Makefile deleted file mode 100644 index f4b836129cf..00000000000 --- a/Build/source/texk/makejvf/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -CC = gcc -CCLD =$(CC) -PROGRAM = makejvf - -# インストール先を DISTDIR に指定する -DISTDIR = /usr/local/bin - -CFLAGS = -O -PROGLINK = $(CC) $(OBJS) -o $(PROGRAM) - -OBJS = main.o tfmread.o tool.o write.o - -link_command = $(CCLD) -o $(PROGRAM) $(LDFLAGS) - -$(PROGRAM): $(OBJS) $(kpathsea) - $(PROGLINK) - -main.o:main.c -tfmread.o:tfmread.c -tool.o:tool.c -write.o:write.c - -install: $(PROGRAM) - install -C -m 755 $? $(DISTDIR) - -clean: - rm -f *.o makejvf - -distclean: - rm -f *.o *.core *.tfm *.vf *.tex *.dvi *.ps $(PROGRAM) diff --git a/Build/source/texk/makejvf/Makefile.am b/Build/source/texk/makejvf/Makefile.am index cd96a498a82..c29ed5fcd7b 100644 --- a/Build/source/texk/makejvf/Makefile.am +++ b/Build/source/texk/makejvf/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory texk/makejvfk/ ## -## Copyright (C) 2009 Peter Breitenlohner +## Copyright (C) 2010 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I ../../m4 @@ -18,7 +18,13 @@ $(makejvf_OBJECTS): $(KPATHSEA_DEPEND) $(PTEXENC_DEPEND) LDADD = $(PTEXENC_LIBS) $(KPATHSEA_LIBS) ## Rebuild libkpathsea & libptexenc +@KPATHSEA_RULE@ @PTEXENC_RULE@ EXTRA_DIST = COPYRIGHT COPYRIGHT.jis Changes.txt README.txt +## Eventually delete this file +## +EXTRA_DIST += \ + Makefile.orig + diff --git a/Build/source/texk/makejvf/Makefile.in b/Build/source/texk/makejvf/Makefile.in index 7a2ed0628ad..6f2eb9816c1 100644 --- a/Build/source/texk/makejvf/Makefile.in +++ b/Build/source/texk/makejvf/Makefile.in @@ -48,7 +48,7 @@ DIST_COMMON = $(am__configure_deps) \ ../../build-aux/config.sub ../../build-aux/depcomp \ ../../build-aux/install-sh ../../build-aux/ltmain.sh \ ../../build-aux/missing ../../build-aux/texinfo.tex \ - ../../build-aux/ylwrap + ../../build-aux/ylwrap ChangeLog ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \ @@ -232,7 +232,8 @@ makejvf_SOURCES = \ main.c makejvf.h tfmread.c tool.c write.c LDADD = $(PTEXENC_LIBS) $(KPATHSEA_LIBS) -EXTRA_DIST = COPYRIGHT COPYRIGHT.jis Changes.txt README.txt +EXTRA_DIST = COPYRIGHT COPYRIGHT.jis Changes.txt README.txt \ + Makefile.orig all: c-auto.h $(MAKE) $(AM_MAKEFLAGS) all-am @@ -703,6 +704,7 @@ uninstall-am: uninstall-binPROGRAMS $(makejvf_OBJECTS): $(KPATHSEA_DEPEND) $(PTEXENC_DEPEND) +@KPATHSEA_RULE@ @PTEXENC_RULE@ # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/Build/source/texk/makejvf/Makefile.orig b/Build/source/texk/makejvf/Makefile.orig new file mode 100644 index 00000000000..f4b836129cf --- /dev/null +++ b/Build/source/texk/makejvf/Makefile.orig @@ -0,0 +1,30 @@ +CC = gcc +CCLD =$(CC) +PROGRAM = makejvf + +# インストール先を DISTDIR に指定する +DISTDIR = /usr/local/bin + +CFLAGS = -O +PROGLINK = $(CC) $(OBJS) -o $(PROGRAM) + +OBJS = main.o tfmread.o tool.o write.o + +link_command = $(CCLD) -o $(PROGRAM) $(LDFLAGS) + +$(PROGRAM): $(OBJS) $(kpathsea) + $(PROGLINK) + +main.o:main.c +tfmread.o:tfmread.c +tool.o:tool.c +write.o:write.c + +install: $(PROGRAM) + install -C -m 755 $? $(DISTDIR) + +clean: + rm -f *.o makejvf + +distclean: + rm -f *.o *.core *.tfm *.vf *.tex *.dvi *.ps $(PROGRAM) diff --git a/Build/source/texk/makejvf/configure.ac b/Build/source/texk/makejvf/configure.ac index b8397904ba4..dcffa1a3085 100644 --- a/Build/source/texk/makejvf/configure.ac +++ b/Build/source/texk/makejvf/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. dnl -dnl Copyright (C) 2009 Peter Breitenlohner +dnl Copyright (C) 2010 Peter Breitenlohner dnl dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, -- cgit v1.2.3