From 030c7d295204835a00a4084ca59b1f712afb39fe Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Fri, 29 May 2009 11:31:46 +0000 Subject: revive Web2C versions of omega font utils some cleanup git-svn-id: svn://tug.org/texlive/trunk@13517 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/otps/Makefile.am | 17 +++++---- Build/source/texk/web2c/otps/Makefile.in | 44 ++++++++++++---------- Build/source/texk/web2c/otps/Makefile.in.orig | 53 --------------------------- 3 files changed, 34 insertions(+), 80 deletions(-) delete mode 100644 Build/source/texk/web2c/otps/Makefile.in.orig (limited to 'Build/source/texk/web2c/otps') diff --git a/Build/source/texk/web2c/otps/Makefile.am b/Build/source/texk/web2c/otps/Makefile.am index 31ff842c178..5ecf9e13710 100644 --- a/Build/source/texk/web2c/otps/Makefile.am +++ b/Build/source/texk/web2c/otps/Makefile.am @@ -19,11 +19,18 @@ $(proglib): $(KPATHSEA_DEPEND) ${top_srcdir}/lib/*.c ## Rebuild libkpathsea @KPATHSEA_RULE@ -bin_PROGRAMS = otp2ocp outocp +otps_programs = otp2ocp outocp +otps_scripts = mkocp mkofm noinst_HEADERS = otp.h routines.h yystype.h -dist_bin_SCRIPTS = mkocp mkofm +if OTANGLE +bin_PROGRAMS = $(otps_programs) +bin_SCRIPTS = $(otps_scripts) +endif OTANGLE +EXTRA_PROGRAMS = $(otps_programs) + +EXTRA_DIST = $(otps_scripts) otp2ocp_SOURCES = \ otp-parser.y \ @@ -42,9 +49,5 @@ outocp_LDADD = $(proglib) $(KPATHSEA_LIBS) ## Not used ## -EXTRA_DIST = bugs.txt +EXTRA_DIST += bugs.txt -## Eventually delete these files -## -EXTRA_DIST += \ - Makefile.in.orig diff --git a/Build/source/texk/web2c/otps/Makefile.in b/Build/source/texk/web2c/otps/Makefile.in index e092afb31f7..a5e2fbe03b2 100644 --- a/Build/source/texk/web2c/otps/Makefile.in +++ b/Build/source/texk/web2c/otps/Makefile.in @@ -36,11 +36,12 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -bin_PROGRAMS = otp2ocp$(EXEEXT) outocp$(EXEEXT) +@OTANGLE_TRUE@bin_PROGRAMS = $(am__EXEEXT_1) +EXTRA_PROGRAMS = $(am__EXEEXT_1) subdir = otps -DIST_COMMON = $(dist_bin_SCRIPTS) $(noinst_HEADERS) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog \ - otp-lexer.c otp-parser.c otp-parser.h +DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in ChangeLog otp-lexer.c otp-parser.c \ + otp-parser.h ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-asm.m4 \ $(top_srcdir)/../../m4/kpse-common.m4 \ @@ -73,6 +74,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/../../build-aux/mkinstalldirs CONFIG_HEADER = $(top_builddir)/c-auto.h $(top_builddir)/ff-config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +am__EXEEXT_1 = otp2ocp$(EXEEXT) outocp$(EXEEXT) am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" PROGRAMS = $(bin_PROGRAMS) am_otp2ocp_OBJECTS = otp-parser.$(OBJEXT) otp-lexer.$(OBJEXT) \ @@ -105,7 +107,7 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -SCRIPTS = $(dist_bin_SCRIPTS) +SCRIPTS = $(bin_SCRIPTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp am__depfiles_maybe = depfiles @@ -313,8 +315,11 @@ x_tool_libs = @x_tool_libs@ INCLUDES = -I$(top_builddir)/.. -I$(top_srcdir) $(KPATHSEA_INCLUDES) AM_YFLAGS = -d -v proglib = ../lib/lib.a +otps_programs = otp2ocp outocp +otps_scripts = mkocp mkofm noinst_HEADERS = otp.h routines.h yystype.h -dist_bin_SCRIPTS = mkocp mkofm +@OTANGLE_TRUE@bin_SCRIPTS = $(otps_scripts) +EXTRA_DIST = $(otps_scripts) bugs.txt otp2ocp_SOURCES = \ otp-parser.y \ otp-lexer.l \ @@ -327,7 +332,6 @@ outocp_SOURCES = \ outocp.c outocp_LDADD = $(proglib) $(KPATHSEA_LIBS) -EXTRA_DIST = bugs.txt Makefile.in.orig all: all-am .SUFFIXES: @@ -416,10 +420,10 @@ otp2ocp$(EXEEXT): $(otp2ocp_OBJECTS) $(otp2ocp_DEPENDENCIES) outocp$(EXEEXT): $(outocp_OBJECTS) $(outocp_DEPENDENCIES) @rm -f outocp$(EXEEXT) $(LINK) $(outocp_OBJECTS) $(outocp_LDADD) $(LIBS) -install-dist_binSCRIPTS: $(dist_bin_SCRIPTS) +install-binSCRIPTS: $(bin_SCRIPTS) @$(NORMAL_INSTALL) test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" - @list='$(dist_bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ + @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ @@ -442,9 +446,9 @@ install-dist_binSCRIPTS: $(dist_bin_SCRIPTS) } \ ; done -uninstall-dist_binSCRIPTS: +uninstall-binSCRIPTS: @$(NORMAL_UNINSTALL) - @list='$(dist_bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \ + @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 's,.*/,,;$(transform)'`; \ test -n "$$list" || exit 0; \ @@ -642,7 +646,7 @@ install-dvi: install-dvi-am install-dvi-am: -install-exec-am: install-binPROGRAMS install-dist_binSCRIPTS +install-exec-am: install-binPROGRAMS install-binSCRIPTS install-html: install-html-am @@ -682,7 +686,7 @@ ps: ps-am ps-am: -uninstall-am: uninstall-binPROGRAMS uninstall-dist_binSCRIPTS +uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS .MAKE: install-am install-strip @@ -690,16 +694,16 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dist_binSCRIPTS clean-generic clean-libtool ctags distclean distclean-compile \ distclean-generic distclean-libtool distclean-tags distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am \ - install-dist_binSCRIPTS install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ + install-binPROGRAMS install-binSCRIPTS install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags uninstall uninstall-am uninstall-binPROGRAMS \ - uninstall-dist_binSCRIPTS + uninstall-binSCRIPTS $(proglib): $(KPATHSEA_DEPEND) ${top_srcdir}/lib/*.c diff --git a/Build/source/texk/web2c/otps/Makefile.in.orig b/Build/source/texk/web2c/otps/Makefile.in.orig deleted file mode 100644 index ee81a2d2a9c..00000000000 --- a/Build/source/texk/web2c/otps/Makefile.in.orig +++ /dev/null @@ -1,53 +0,0 @@ -# @configure_input@ -# Makefile for otps. - -# These get expanded from the parent directory, not this one. -kpse_include ../make/common.mk -kpse_include ../make/programs.mk -kpse_include ../make/paths.mk -kpse_include kpathsea.mk - -LEX = @LEX@ -LEXLIB = @LEXLIB@ -LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -YACC = @YACC@ - -proglib = ../lib/lib.a -programs = otp2ocp outocp -scripts = mkocp mkofm - -otp2ocp_objects = otp2ocp.o routines.o y_tab.o $(LEX_OUTPUT_ROOT).o -all: $(programs) -otp2ocp: $(otp2ocp_objects) - $(kpathsea_link) $(otp2ocp_objects) $(LEXLIB) $(LOADLIBES) - -otp2ocp.o: otp2ocp.c y_tab.h -y_tab.c y_tab.h: otp.y - $(YACC) -d -v $(srcdir)/otp.y - -test -f y.tab.c && mv -f y.tab.c y_tab.c - -test -f y.tab.h && mv -f y.tab.h y_tab.h -$(LEX_OUTPUT_ROOT).o: otp.h -$(LEX_OUTPUT_ROOT).c: otp.l - $(LEX) $(srcdir)/otp.l - -outocp: outocp.o - $(kpathsea_link) outocp.o $(LOADLIBES) - -$(programs): $(proglib) $(kpathsea) - -install-programs: $(programs) - $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir) - for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done - for p in $(scripts); do $(INSTALL_SCRIPT) $(srcdir)/$$p $(scriptdir); done - -Makefile: Makefile.in ../config.status - cd .. && $(SHELL) config.status - -kpse_include ../make/tkpathsea.mk -kpse_include ../make/clean.mk - -clean:: - rm -f y_tab.c y_tab.h y.out* yacc.* $(LEX_OUTPUT_ROOT).c - -kpse_include ../make/rdepend.mk -kpse_include otps/depend.mk -- cgit v1.2.3