From 21b33267273c9bbae4881db7a1267f1e8e5b688c Mon Sep 17 00:00:00 2001 From: Matthieu Herrb Date: Sat, 12 Jun 2010 16:53:37 +0000 Subject: Update to xlsfonts 1.0.3 --- app/xlsfonts/Makefile.in | 105 +++++++++++++++++++++-------------------------- 1 file changed, 47 insertions(+), 58 deletions(-) (limited to 'app/xlsfonts/Makefile.in') diff --git a/app/xlsfonts/Makefile.in b/app/xlsfonts/Makefile.in index f7f42d51e..d93bdf8d4 100644 --- a/app/xlsfonts/Makefile.in +++ b/app/xlsfonts/Makefile.in @@ -62,7 +62,7 @@ bin_PROGRAMS = xlsfonts$(EXEEXT) DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ - compile config.guess config.sub depcomp install-sh missing + config.guess config.sub depcomp install-sh missing subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -76,8 +76,7 @@ CONFIG_CLEAN_FILES = am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) -am_xlsfonts_OBJECTS = xlsfonts-dsimple.$(OBJEXT) \ - xlsfonts-xlsfonts.$(OBJEXT) +am_xlsfonts_OBJECTS = dsimple.$(OBJEXT) xlsfonts.$(OBJEXT) xlsfonts_OBJECTS = $(am_xlsfonts_OBJECTS) am__DEPENDENCIES_1 = xlsfonts_DEPENDENCIES = $(am__DEPENDENCIES_1) @@ -117,6 +116,7 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APP_MAN_DIR = @APP_MAN_DIR@ APP_MAN_SUFFIX = @APP_MAN_SUFFIX@ AUTOCONF = @AUTOCONF@ @@ -126,7 +126,10 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CHANGELOG_CMD = @CHANGELOG_CMD@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CWARNFLAGS = @CWARNFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -135,9 +138,12 @@ DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ +GREP = @GREP@ +INSTALL_CMD = @INSTALL_CMD@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -152,6 +158,19 @@ MAINT = @MAINT@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MAN_SUBSTS = \ + -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ + -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ + -e 's|__xservername__|Xorg|g' \ + -e 's|__xconfigfile__|xorg.conf|g' \ + -e 's|__projectroot__|$(prefix)|g' \ + -e 's|__apploaddir__|$(appdefaultdir)|' \ + -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ + -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ + -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ + -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ + -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' + MISC_MAN_DIR = @MISC_MAN_DIR@ MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ OBJEXT = @OBJEXT@ @@ -163,15 +182,15 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +SED = sed SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ XLSFONTS_CFLAGS = @XLSFONTS_CFLAGS@ XLSFONTS_LIBS = @XLSFONTS_LIBS@ +XORG_MAN_PAGE = @XORG_MAN_PAGE@ ac_ct_CC = @ac_ct_CC@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ @@ -186,28 +205,35 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -xlsfonts_CFLAGS = $(XLSFONTS_CFLAGS) +AM_CFLAGS = $(XLSFONTS_CFLAGS) $(CWARNFLAGS) xlsfonts_LDADD = $(XLSFONTS_LIBS) xlsfonts_SOURCES = \ dsimple.c \ @@ -217,29 +243,15 @@ xlsfonts_SOURCES = \ appman_PRE = \ xlsfonts.man -EXTRA_DIST = xlsfonts.sgml ChangeLog autogen.sh $(appman_PRE) -MAINTAINERCLEANFILES = ChangeLog +EXTRA_DIST = xlsfonts.sgml autogen.sh $(appman_PRE) appmandir = $(APP_MAN_DIR) appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) +MAINTAINERCLEANFILES = ChangeLog INSTALL CLEANFILES = $(appman_DATA) -SED = sed # Strings to replace in man pages XORGRELSTRING = @PACKAGE_STRING@ XORGMANNAME = X Version 11 -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xservername__|Xorg|g' \ - -e 's|__xconfigfile__|xorg.conf|g' \ - -e 's|__projectroot__|$(prefix)|g' \ - -e 's|__apploaddir__|$(appdefaultdir)|' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' - SUFFIXES = .$(APP_MAN_SUFFIX) .man all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am @@ -252,15 +264,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ - cd $(srcdir) && $(AUTOMAKE) --gnu \ + echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \ + cd $(srcdir) && $(AUTOMAKE) --foreign \ && exit 0; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu Makefile + $(AUTOMAKE) --foreign Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -329,8 +341,8 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xlsfonts-dsimple.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xlsfonts-xlsfonts.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dsimple.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xlsfonts.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ @@ -345,34 +357,6 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - -xlsfonts-dsimple.o: dsimple.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xlsfonts_CFLAGS) $(CFLAGS) -MT xlsfonts-dsimple.o -MD -MP -MF "$(DEPDIR)/xlsfonts-dsimple.Tpo" -c -o xlsfonts-dsimple.o `test -f 'dsimple.c' || echo '$(srcdir)/'`dsimple.c; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xlsfonts-dsimple.Tpo" "$(DEPDIR)/xlsfonts-dsimple.Po"; else rm -f "$(DEPDIR)/xlsfonts-dsimple.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dsimple.c' object='xlsfonts-dsimple.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xlsfonts_CFLAGS) $(CFLAGS) -c -o xlsfonts-dsimple.o `test -f 'dsimple.c' || echo '$(srcdir)/'`dsimple.c - -xlsfonts-dsimple.obj: dsimple.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xlsfonts_CFLAGS) $(CFLAGS) -MT xlsfonts-dsimple.obj -MD -MP -MF "$(DEPDIR)/xlsfonts-dsimple.Tpo" -c -o xlsfonts-dsimple.obj `if test -f 'dsimple.c'; then $(CYGPATH_W) 'dsimple.c'; else $(CYGPATH_W) '$(srcdir)/dsimple.c'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xlsfonts-dsimple.Tpo" "$(DEPDIR)/xlsfonts-dsimple.Po"; else rm -f "$(DEPDIR)/xlsfonts-dsimple.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dsimple.c' object='xlsfonts-dsimple.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xlsfonts_CFLAGS) $(CFLAGS) -c -o xlsfonts-dsimple.obj `if test -f 'dsimple.c'; then $(CYGPATH_W) 'dsimple.c'; else $(CYGPATH_W) '$(srcdir)/dsimple.c'; fi` - -xlsfonts-xlsfonts.o: xlsfonts.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xlsfonts_CFLAGS) $(CFLAGS) -MT xlsfonts-xlsfonts.o -MD -MP -MF "$(DEPDIR)/xlsfonts-xlsfonts.Tpo" -c -o xlsfonts-xlsfonts.o `test -f 'xlsfonts.c' || echo '$(srcdir)/'`xlsfonts.c; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xlsfonts-xlsfonts.Tpo" "$(DEPDIR)/xlsfonts-xlsfonts.Po"; else rm -f "$(DEPDIR)/xlsfonts-xlsfonts.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xlsfonts.c' object='xlsfonts-xlsfonts.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xlsfonts_CFLAGS) $(CFLAGS) -c -o xlsfonts-xlsfonts.o `test -f 'xlsfonts.c' || echo '$(srcdir)/'`xlsfonts.c - -xlsfonts-xlsfonts.obj: xlsfonts.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xlsfonts_CFLAGS) $(CFLAGS) -MT xlsfonts-xlsfonts.obj -MD -MP -MF "$(DEPDIR)/xlsfonts-xlsfonts.Tpo" -c -o xlsfonts-xlsfonts.obj `if test -f 'xlsfonts.c'; then $(CYGPATH_W) 'xlsfonts.c'; else $(CYGPATH_W) '$(srcdir)/xlsfonts.c'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xlsfonts-xlsfonts.Tpo" "$(DEPDIR)/xlsfonts-xlsfonts.Po"; else rm -f "$(DEPDIR)/xlsfonts-xlsfonts.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xlsfonts.c' object='xlsfonts-xlsfonts.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xlsfonts_CFLAGS) $(CFLAGS) -c -o xlsfonts-xlsfonts.obj `if test -f 'xlsfonts.c'; then $(CYGPATH_W) 'xlsfonts.c'; else $(CYGPATH_W) '$(srcdir)/xlsfonts.c'; fi` uninstall-info-am: install-appmanDATA: $(appman_DATA) @$(NORMAL_INSTALL) @@ -671,10 +655,15 @@ uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \ uninstall-info-am +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) + ChangeLog: - (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + $(CHANGELOG_CMD) -dist-hook: ChangeLog +dist-hook: ChangeLog INSTALL .man.$(APP_MAN_SUFFIX): sed $(MAN_SUBSTS) < $< > $@ -- cgit v1.2.3