From 8088c160bf91e344e2ffd3cfaba0112d50fd7d0e Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Thu, 20 Apr 2006 11:10:42 +0000 Subject: INTEGRATION: CWS dmake43p01 (1.9.2); FILE MERGED 2005/09/26 00:33:13 vq 1.9.2.6: #i55070# Fix Fred Fishes DBUG macros and add --enable-dbug to enable them in a configure type build. Also regenerate autotool files. 2005/09/20 00:50:41 vq 1.9.2.5: #i49461# Add testcase and regenerate configure and other autotools files. 2005/09/02 00:25:35 vq 1.9.2.4: #i52238# Regenerate configure and other autotools files. 2005/06/04 18:07:38 vq 1.9.2.3: #i39248# Add another testcase. 2005/04/22 01:27:18 vq 1.9.2.2: #i47851# Regenerate configure and other autotools files. 2005/04/16 23:05:16 vq 1.9.2.1: #i47578# Regenerate configure and other autotools files. --- dmake/startup/Makefile.in | 50 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 36 insertions(+), 14 deletions(-) (limited to 'dmake/startup') diff --git a/dmake/startup/Makefile.in b/dmake/startup/Makefile.in index ab34f280afe3..a5710347e88c 100644 --- a/dmake/startup/Makefile.in +++ b/dmake/startup/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.1 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -34,8 +34,11 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ +LIBOBJDIR = subdir = startup -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/config.mk.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.in @@ -43,7 +46,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = +CONFIG_CLEAN_FILES = config.mk SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -63,7 +66,6 @@ startupDATA_INSTALL = $(INSTALL_DATA) DATA = $(startup_DATA) ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -79,8 +81,11 @@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ +DBUG_FALSE = @DBUG_FALSE@ +DBUG_TRUE = @DBUG_TRUE@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DMAKEROOT_H_LINE1 = @DMAKEROOT_H_LINE1@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -127,7 +132,11 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ +build = @build@ build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ datadir = @datadir@ exec_prefix = @exec_prefix@ host_alias = @host_alias@ @@ -147,9 +156,8 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ startupdir = $(datadir)/startup -startup_DATA = startup.mk template.mk - -#SUBDIRS = mac msdos os2 qssl unix win95 winnt +startup_DATA = startup.mk config.mk +DIST_SUBDIRS = unix winnt SUBDIRS = @OS_TYPE@ all: all-recursive @@ -163,9 +171,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu startup/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign startup/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu startup/Makefile + $(AUTOMAKE) --foreign startup/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -183,6 +191,8 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +config.mk: $(top_builddir)/config.status $(srcdir)/config.mk.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ uninstall-info-am: install-startupDATA: $(startup_DATA) @$(NORMAL_INSTALL) @@ -209,7 +219,13 @@ uninstall-startupDATA: # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @set fnord $$MAKEFLAGS; amf=$$2; \ + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ @@ -221,7 +237,7 @@ $(RECURSIVE_TARGETS): local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + || eval $$failcom; \ done; \ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ @@ -229,7 +245,13 @@ $(RECURSIVE_TARGETS): mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: - @set fnord $$MAKEFLAGS; amf=$$2; \ + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ @@ -250,7 +272,7 @@ maintainer-clean-recursive: local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + || eval $$failcom; \ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -- cgit v1.2.3