diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-01-19 17:55:53 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-01-19 17:55:53 +0000 |
commit | 324f128397ee924ac22fde443adc73d0bccdf7bb (patch) | |
tree | 4030fc50ceb92cb24e0132c3872040d4ab3b1c4c | |
parent | 99566ea0f91169641232fc4cc334f64ee0a0ec3b (diff) |
utils/dialog/: build system update
git-svn-id: svn://tug.org/texlive/trunk@16787 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Build/source/utils/dialog/Makefile.am | 18 | ||||
-rw-r--r-- | Build/source/utils/dialog/Makefile.in | 23 | ||||
-rwxr-xr-x | Build/source/utils/dialog/configure | 21 | ||||
-rw-r--r-- | Build/source/utils/dialog/configure.ac | 14 |
4 files changed, 36 insertions, 40 deletions
diff --git a/Build/source/utils/dialog/Makefile.am b/Build/source/utils/dialog/Makefile.am index 98a04cfd73f..61a0c427f07 100644 --- a/Build/source/utils/dialog/Makefile.am +++ b/Build/source/utils/dialog/Makefile.am @@ -1,6 +1,6 @@ ## Proxy Makefile.am to build dialog for TeX Live. ## -## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org> ## ## This file is free software; the copyright holder ## gives unlimited permission to copy and/or distribute it, @@ -27,21 +27,23 @@ dist-hook: dlg_config.h headers-sh makefile samples/install/makefile \ *.a *.o `find -name .svn` -if build - nodist_man1_MANS = $(DIALOG_TREE)/dialog.1 bin_PROGRAMS = $(DIALOG_TREE)/dialog -$(DIALOG_TREE)/dialog$(EXEEXT): +$(DIALOG_TREE)/dialog$(EXEEXT): config.force cd $(DIALOG_TREE) && $(MAKE) $(AM_MAKEFLAGS) all -distclean-local: - cd $(DIALOG_TREE) && $(MAKE) $(AM_MAKEFLAGS) distclean +config.force: + echo timestamp >config.force + eval $(srcdir)/configure "`./config.status --config`" -else !build distclean-local: -endif !build + if test -f "$(DIALOG_TREE)/Makefile"; then \ + cd $(DIALOG_TREE) && $(MAKE) $(AM_MAKEFLAGS) distclean; \ + else :; fi __DIALOG_TREE__dialog_SOURCES = +DISTCLEANFILES = config.force + diff --git a/Build/source/utils/dialog/Makefile.in b/Build/source/utils/dialog/Makefile.in index 18e73462374..463562e9dfe 100644 --- a/Build/source/utils/dialog/Makefile.in +++ b/Build/source/utils/dialog/Makefile.in @@ -32,7 +32,7 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -@build_TRUE@bin_PROGRAMS = $(DIALOG_TREE)/dialog$(EXEEXT) +bin_PROGRAMS = $(DIALOG_TREE)/dialog$(EXEEXT) subdir = . DIST_COMMON = $(am__configure_deps) \ $(srcdir)/../../build-aux/install-sh \ @@ -191,8 +191,9 @@ ACLOCAL_AMFLAGS = -I ../../m4 # We want to re-distribute the whole original dialog source tree. EXTRA_DIST = $(DIALOG_TREE) -@build_TRUE@nodist_man1_MANS = $(DIALOG_TREE)/dialog.1 +nodist_man1_MANS = $(DIALOG_TREE)/dialog.1 __DIALOG_TREE__dialog_SOURCES = +DISTCLEANFILES = config.force all: all-am .SUFFIXES: @@ -270,9 +271,6 @@ clean-binPROGRAMS: $(DIALOG_TREE)/$(am__dirstamp): @$(MKDIR_P) $(DIALOG_TREE) @: > $(DIALOG_TREE)/$(am__dirstamp) -@build_FALSE@$(DIALOG_TREE)/dialog$(EXEEXT): $(__DIALOG_TREE__dialog_OBJECTS) $(__DIALOG_TREE__dialog_DEPENDENCIES) $(DIALOG_TREE)/$(am__dirstamp) -@build_FALSE@ @rm -f $(DIALOG_TREE)/dialog$(EXEEXT) -@build_FALSE@ $(LINK) $(__DIALOG_TREE__dialog_OBJECTS) $(__DIALOG_TREE__dialog_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -512,6 +510,7 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) -test -z "$(DIALOG_TREE)/$(am__dirstamp)" || rm -f $(DIALOG_TREE)/$(am__dirstamp) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -614,13 +613,17 @@ dist-hook: dlg_config.h headers-sh makefile samples/install/makefile \ *.a *.o `find -name .svn` -@build_TRUE@$(DIALOG_TREE)/dialog$(EXEEXT): -@build_TRUE@ cd $(DIALOG_TREE) && $(MAKE) $(AM_MAKEFLAGS) all +$(DIALOG_TREE)/dialog$(EXEEXT): config.force + cd $(DIALOG_TREE) && $(MAKE) $(AM_MAKEFLAGS) all -@build_TRUE@distclean-local: -@build_TRUE@ cd $(DIALOG_TREE) && $(MAKE) $(AM_MAKEFLAGS) distclean +config.force: + echo timestamp >config.force + eval $(srcdir)/configure "`./config.status --config`" -@build_FALSE@distclean-local: +distclean-local: + if test -f "$(DIALOG_TREE)/Makefile"; then \ + cd $(DIALOG_TREE) && $(MAKE) $(AM_MAKEFLAGS) distclean; \ + else :; fi # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/Build/source/utils/dialog/configure b/Build/source/utils/dialog/configure index 13be3c712d6..9e3a7f1bad3 100755 --- a/Build/source/utils/dialog/configure +++ b/Build/source/utils/dialog/configure @@ -562,8 +562,6 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS -build_FALSE -build_TRUE subdirs DIALOG_TREE am__fastdepCC_FALSE @@ -3309,18 +3307,13 @@ DIALOG_TREE=dialog-1.1-20080819 subdirs="$subdirs " -# when building dialog, configure the subdir $DIALOG_TREE -# but prevent autoreconf from recursing into this subdir. -test "x$enable_dialog" = xyes && subdirs=$DIALOG_TREE - if test "x$enable_dialog" = xyes; then - build_TRUE= - build_FALSE='#' -else - build_TRUE='#' - build_FALSE= +if test "x$enable_build" != xno || test -f config.force; then + # when building dialog, configure the subdir $DIALOG_TREE + # but prevent autoreconf from recursing into this subdir. + subdirs=$DIALOG_TREE + echo timestamp >config.force fi - ac_config_files="$ac_config_files Makefile" @@ -3477,10 +3470,6 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then as_fn_error "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${build_TRUE}" && test -z "${build_FALSE}"; then - as_fn_error "conditional \"build\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi : ${CONFIG_STATUS=./config.status} ac_write_fail=0 diff --git a/Build/source/utils/dialog/configure.ac b/Build/source/utils/dialog/configure.ac index f0f3662efa6..6605873ae83 100644 --- a/Build/source/utils/dialog/configure.ac +++ b/Build/source/utils/dialog/configure.ac @@ -1,12 +1,12 @@ dnl Process this file with autoconf to produce a configure script. dnl -dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org> dnl dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl -m4_define([dialog_version], [1.1-20080819])[]dnl using unmodified dialog-1.1-20080819 source tree +m4_define([dialog_version], [1.1-20080819])[]dnl using unmodified dialog source tree AC_PREREQ([2.65]) AC_INIT([dialog for TeX Live], dialog_version, [peb@mppmu.mpg.de]) AC_CONFIG_SRCDIR([dialog-]dialog_version[/dialog.c]) @@ -27,10 +27,12 @@ AC_SUBST([DIALOG_TREE]) # Initialize the subdir machinery AC_CONFIG_SUBDIRS([]) -# when building dialog, configure the subdir $DIALOG_TREE -# but prevent autoreconf from recursing into this subdir. -test "x$enable_dialog" = xyes && subdirs=$DIALOG_TREE -AM_CONDITIONAL([build], [test "x$enable_dialog" = xyes]) +if test "x$enable_build" != xno || test -f config.force; then + # when building dialog, configure the subdir $DIALOG_TREE + # but prevent autoreconf from recursing into this subdir. + subdirs=$DIALOG_TREE + echo timestamp >config.force +fi AC_CONFIG_FILES([Makefile]) |