diff options
author | Kurt Zenker <kz@openoffice.org> | 2004-02-25 12:55:48 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2004-02-25 12:55:48 +0000 |
commit | ba3e56bb48c6607ef80fc293d17d1550a0d2ead8 (patch) | |
tree | 4f681aa7c230e427940337c797eb0585a58d352c /dmake/startup | |
parent | eae39804e1ef1d9f7f4485d58738bd80309c8457 (diff) |
INTEGRATION: CWS geordi2q15 (1.2.48); FILE MERGED
2004/02/20 12:29:02 hr 1.2.48.1: #111934#: merge CWS ooo111fix3
Diffstat (limited to 'dmake/startup')
-rw-r--r-- | dmake/startup/winnt/mingw/Makefile.in | 17 | ||||
-rw-r--r-- | dmake/startup/winnt/msvc6/Makefile.in | 17 |
2 files changed, 18 insertions, 16 deletions
diff --git a/dmake/startup/winnt/mingw/Makefile.in b/dmake/startup/winnt/mingw/Makefile.in index c5fc125cd2b3..96c83f9bc52d 100644 --- a/dmake/startup/winnt/mingw/Makefile.in +++ b/dmake/startup/winnt/mingw/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7.2 from Makefile.am. +# Makefile.in generated by automake 1.7.9 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -92,6 +92,7 @@ ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ bindir = @bindir@ build_alias = @build_alias@ @@ -116,13 +117,14 @@ startupdir = $(datadir)/startup/winnt/mingw startup_DATA = macros.mk subdir = startup/winnt/mingw +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = DIST_SOURCES = DATA = $(startup_DATA) -DIST_COMMON = Makefile.am Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in Makefile.am all: all-am .SUFFIXES: @@ -194,7 +196,6 @@ all-am: Makefile $(DATA) installdirs: $(mkinstalldirs) $(DESTDIR)$(startupdir) - install: install-am install-exec: install-exec-am install-data: install-data-am @@ -206,7 +207,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -214,7 +215,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -224,7 +225,7 @@ clean: clean-am clean-am: clean-generic mostlyclean-am distclean: distclean-am - + -rm -f Makefile distclean-am: clean-am distclean-generic dvi: dvi-am @@ -246,7 +247,7 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am diff --git a/dmake/startup/winnt/msvc6/Makefile.in b/dmake/startup/winnt/msvc6/Makefile.in index f9a8c553d509..b50eeac38b0d 100644 --- a/dmake/startup/winnt/msvc6/Makefile.in +++ b/dmake/startup/winnt/msvc6/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7.2 from Makefile.am. +# Makefile.in generated by automake 1.7.9 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -92,6 +92,7 @@ ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ bindir = @bindir@ build_alias = @build_alias@ @@ -116,13 +117,14 @@ startupdir = $(datadir)/startup/winnt/msvc6 startup_DATA = macros.mk subdir = startup/winnt/msvc6 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = DIST_SOURCES = DATA = $(startup_DATA) -DIST_COMMON = Makefile.am Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in Makefile.am all: all-am .SUFFIXES: @@ -194,7 +196,6 @@ all-am: Makefile $(DATA) installdirs: $(mkinstalldirs) $(DESTDIR)$(startupdir) - install: install-am install-exec: install-exec-am install-data: install-data-am @@ -206,7 +207,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -214,7 +215,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -224,7 +225,7 @@ clean: clean-am clean-am: clean-generic mostlyclean-am distclean: distclean-am - + -rm -f Makefile distclean-am: clean-am distclean-generic dvi: dvi-am @@ -246,7 +247,7 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am |