summaryrefslogtreecommitdiff
path: root/dmake/startup
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2004-02-25 12:54:37 +0000
committerKurt Zenker <kz@openoffice.org>2004-02-25 12:54:37 +0000
commitccaf37e79d9318ac1c5c4e097f05836c9d397600 (patch)
tree714279ac213c35f5d27e53359fa2fc67b21562df /dmake/startup
parentbdb471ffe2ad2ef392a29e1d2d893702a5318585 (diff)
INTEGRATION: CWS geordi2q15 (1.7.48); FILE MERGED
2004/02/20 12:28:59 hr 1.7.48.1: #111934#: merge CWS ooo111fix3
Diffstat (limited to 'dmake/startup')
-rw-r--r--dmake/startup/unix/linux/Makefile.in17
1 files changed, 9 insertions, 8 deletions
diff --git a/dmake/startup/unix/linux/Makefile.in b/dmake/startup/unix/linux/Makefile.in
index bb2c01093503..9b3a4409438e 100644
--- a/dmake/startup/unix/linux/Makefile.in
+++ b/dmake/startup/unix/linux/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@
@@ -117,13 +118,14 @@ startupdir = $(datadir)/startup/unix/linux
startup_DATA = macros.mk
subdir = startup/unix/linux
+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:
@@ -195,7 +197,6 @@ all-am: Makefile $(DATA)
installdirs:
$(mkinstalldirs) $(DESTDIR)$(startupdir)
-
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -207,7 +208,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:
@@ -215,7 +216,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"
@@ -225,7 +226,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
@@ -247,7 +248,7 @@ install-man:
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am