2004-12-14 Theodore Ts'o <tytso@mit.edu>
+ * Makefile.in: Add install-strip and install-shlibs-strip targets
+
* MCONFIG.in: Add configure-defined variables for MKINSTALLDIRS
and INSTALL_SCRIPT. Filter out comments inserted by newer
versions of gcc when using -M in make depend.
-test -d doc && cd doc && $(MAKE) distclean
install: subs all-libs-recursive install-progs-recursive \
- install-shlibs-libs-recursive install-doc-libs
-# export MANPATH=$(DESTDIR)$(mandir); $(srcdir)/install-utils/compile_manpages
+ install-shlibs-libs-recursive install-doc-libs
if test ! -d e2fsck && test ! -d debugfs && test ! -d misc && test ! -d ext2ed ; then $(MAKE) install-libs ; fi
+install-strip: subs all-libs-recursive install-strip-progs-recursive \
+ install-shlibs-strip-libs-recursive install-doc-libs
+
uninstall: uninstall-progs-recursive uninstall-shlibs-libs-recursive uninstall-doc-libs
install-libs: install-libs-recursive
uninstall-libs: uninstall-libs-recursive
TAGS clean-recursive distclean-recursive depend-recursive check-recursive \
- mostlyclean-recursive realclean-recursive install-recursive:
+ mostlyclean-recursive realclean-recursive:
@for subdir in $(SUBDIRS); do \
if test -d $$subdir ; then \
target=`echo $@|$(SED) 's/-recursive//'`; \
fi ; \
done
-all-progs-recursive install-progs-recursive uninstall-progs-recursive:
+all-progs-recursive install-progs-recursive install-strip-progs-recursive \
+ uninstall-progs-recursive:
@for subdir in $(PROG_SUBDIRS); do \
if test -d $$subdir ; then \
target=`echo $@|$(SED) 's/-progs-recursive//'`; \
fi ; \
done
-all-libs-recursive install-libs-recursive uninstall-libs-recursive install-shlibs-libs-recursive uninstall-shlibs-libs-recursive:
+all-libs-recursive install-libs-recursive install-strip-libs-recursive \
+ uninstall-libs-recursive install-shlibs-libs-recursive \
+ install-shlibs-strip-libs-recursive uninstall-shlibs-libs-recursive:
@for subdir in $(LIB_SUBDIRS); do \
if test -d $$subdir ; then \
target=`echo $@|$(SED) 's/-libs-recursive//'`; \
2004-12-14 Theodore Ts'o <tytso@mit.edu>
+ * Makefile.in: Move strip command to install-strip target.
+ Use Linux-kernel-style makefile output for "make install"
+
* Makefile.in (installdirs): Use $(MKINSTALLDIRS) macro
2004-11-30 Theodore Ts'o <tytso@mit.edu>
@$(SUBSTITUTE_UPTIME) $(srcdir)/debugfs.8.in debugfs.8
installdirs:
- $(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
+ @echo " MKINSTALLDIRS $(root_sbindir) $(man8dir)"
+ @$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
$(DESTDIR)$(man8dir)
install: $(PROGS) $(MANPAGES) installdirs
- for i in $(PROGS); do \
+ @for i in $(PROGS); do \
+ echo " INSTALL $(root_sbindir)/$$i"; \
$(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \
- $(STRIP) $(DESTDIR)$(root_sbindir)/$$i; \
done
- for i in $(MANPAGES); do \
+ @for i in $(MANPAGES); do \
for j in $(COMPRESS_EXT); do \
$(RM) -f $(DESTDIR)$(man8dir)/$$i.$$j; \
done; \
+ echo " INSTALL_DATA $(man8dir)/$$i"; \
$(INSTALL_DATA) $$i $(DESTDIR)$(man8dir)/$$i; \
done
+install-strip: install
+ @for i in $(PROGS); do \
+ echo " STRIP $(root_sbindir)/$$i"; \
+ $(STRIP) $(DESTDIR)$(root_sbindir)/$$i; \
+ done
+
uninstall:
for i in $(PROGS); do \
$(RM) -f $(DESTDIR)$(root_sbindir)/$$i; \
2004-12-14 Theodore Ts'o <tytso@mit.edu>
* Makefile.in (install-doc-libs): Use $(MKINSTALLDIRS) macro
+ Use Linux-kernel-style makefile output for "make install"
2004-11-30 Theodore Ts'o <tytso@mit.edu>
all:: libext2fs.info libext2fs.dvi
install-doc-libs:
- $(RM) -rf $(DESTDIR)$(infodir)/libext2fs.info*
- $(MKINSTALLDIRS) $(DESTDIR)$(infodir)
- for i in libext2fs.info* ; do \
+ @$(RM) -rf $(DESTDIR)$(infodir)/libext2fs.info*
+ @echo " MKINSTALLDIRS $(infodir)"
+ @$(MKINSTALLDIRS) $(DESTDIR)$(infodir)
+ @for i in libext2fs.info* ; do \
+ echo " INSTALL_DATA $(infodir)/$$i" ; \
$(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i ; \
done
- gzip -9 $(DESTDIR)$(infodir)/libext2fs.info*
+ @echo " GZIP $(infodir)/libext2fs.info*"
+ @gzip -9 $(DESTDIR)$(infodir)/libext2fs.info*
uninstall-doc-libs:
$(RM) -rf $(DESTDIR)$(infodir)/libext2fs.info*
2004-12-14 Theodore Ts'o <tytso@mit.edu>
+ * Makefile.in: Move strip command to install-strip target.
+ Use Linux-kernel-style makefile output for "make install"
+
* Makefile.in (installdirs): Use $(MKINSTALLDIRS) macro.
Remove sync in the "all" target.
@$(LD) $(ALL_LDFLAGS) -o iscan iscan.o util.o ehandler.o $(LIBS)
profiled:
- @echo " MKDIR $@"
- @mkdir profiled
+@PROFILE_CMT@ @echo " MKDIR $@"
+@PROFILE_CMT@ @mkdir profiled
e2fsck.8: $(DEP_SUBSTITUTE) $(srcdir)/e2fsck.8.in
@echo " SUBST $@"
@$(SUBSTITUTE_UPTIME) $(srcdir)/e2fsck.8.in e2fsck.8
installdirs:
- $(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
+ @echo " MKINSTALLDIRS $(root_sbindir) $(man8dir)"
+ @$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
$(DESTDIR)$(man8dir)
install: $(PROGS) $(MANPAGES) installdirs
- for i in $(PROGS); do \
+ @for i in $(PROGS); do \
+ echo " INSTALL $(root_sbindir)/$$i"; \
$(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \
- $(STRIP) $(DESTDIR)$(root_sbindir)/$$i; \
done
- $(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
+ @echo " LINK $(root_sbindir)/fsck.ext2"
+ @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
$(DESTDIR)$(root_sbindir)/fsck.ext2
- $(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
+ @echo " LINK $(root_sbindir)/fsck.ext3"
+ @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
$(DESTDIR)$(root_sbindir)/fsck.ext3
- for i in $(MANPAGES); do \
+ @for i in $(MANPAGES); do \
for j in $(COMPRESS_EXT); do \
$(RM) -f $(DESTDIR)$(man8dir)/$$i.$$j; \
done; \
+ echo " INSTALL_DATA $(man8dir)/$$i"; \
$(INSTALL_DATA) $$i $(DESTDIR)$(man8dir)/$$i; \
done
- $(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 $(DESTDIR)$(man8dir)/fsck.ext2.8
- $(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 $(DESTDIR)$(man8dir)/fsck.ext3.8
+ @echo " LINK $(man8dir)/fsck.ext2.8"
+ @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
+ $(DESTDIR)$(man8dir)/fsck.ext2.8
+ @echo " LINK $(man8dir)/fsck.ext3.8"
+ @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
+ $(DESTDIR)$(man8dir)/fsck.ext3.8
+
+install-strip: install
+ @for i in $(PROGS); do \
+ echo " STRIP $(root_sbindir)/$$i"; \
+ $(STRIP) $(DESTDIR)$(root_sbindir)/$$i; \
+ done
uninstall:
for i in $(PROGS); do \
+2004-12-14 Theodore Ts'o <tytso@mit.edu>
+
+ * Add install-shlib-strip target. Update Makefile.in to version
+ from gettext 0.14.1
+
2004-11-30 Theodore Ts'o <tytso@mit.edu>
* Update to gettext version 0.14.1
-# Makefile for directory with message catalog handling in GNU NLS Utilities.
-# Copyright (C) 1995-1998, 2000-2002 Free Software Foundation, Inc.
+# Makefile for directory with message catalog handling library of GNU gettext
+# Copyright (C) 1995-1998, 2000-2003 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify it
# under the terms of the GNU Library General Public License as published
srcdir = @srcdir@
top_srcdir = @top_srcdir@
top_builddir = ..
-VPATH = @srcdir@
+VPATH = $(srcdir)
prefix = @prefix@
exec_prefix = @exec_prefix@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
MKINSTALLDIRS = @MKINSTALLDIRS@
-mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
+mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
l = @INTL_LIBTOOL_SUFFIX_PREFIX@
YFLAGS = --name-prefix=__gettext
DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \
--DLIBDIR=\"$(libdir)\" -DIN_LIBINTL @DEFS@
+-DLIBDIR=\"$(libdir)\" -DIN_LIBINTL \
+-DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"$(libdir)\" -DNO_XMALLOC \
+-Dset_relocation_prefix=libintl_set_relocation_prefix \
+-Drelocate=libintl_relocate \
+-DDEPENDS_ON_LIBICONV=1 @DEFS@
CPPFLAGS = @CPPFLAGS@
CFLAGS = @CFLAGS@
LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
-HEADERS = $(COMHDRS) libgnuintl.h loadinfo.h
-COMHDRS = gmo.h gettextP.h hash-string.h plural-exp.h eval-plural.h os2compat.h
-SOURCES = $(COMSRCS) intl-compat.c
-COMSRCS = bindtextdom.c dcgettext.c dgettext.c gettext.c \
-finddomain.c loadmsgcat.c localealias.c textdomain.c l10nflist.c \
-explodename.c dcigettext.c dcngettext.c dngettext.c ngettext.c plural.y \
-plural-exp.c localcharset.c localename.c osdep.c os2compat.c
-OBJECTS = @INTLOBJS@ bindtextdom.$lo dcgettext.$lo dgettext.$lo gettext.$lo \
-finddomain.$lo loadmsgcat.$lo localealias.$lo textdomain.$lo l10nflist.$lo \
-explodename.$lo dcigettext.$lo dcngettext.$lo dngettext.$lo ngettext.$lo \
-plural.$lo plural-exp.$lo localcharset.$lo localename.$lo osdep.$lo
-GETTOBJS = intl-compat.$lo
+HEADERS = \
+ gmo.h \
+ gettextP.h \
+ hash-string.h \
+ loadinfo.h \
+ plural-exp.h \
+ eval-plural.h \
+ localcharset.h \
+ relocatable.h \
+ xsize.h \
+ printf-args.h printf-args.c \
+ printf-parse.h wprintf-parse.h printf-parse.c \
+ vasnprintf.h vasnwprintf.h vasnprintf.c \
+ os2compat.h \
+ libgnuintl.h.in
+SOURCES = \
+ bindtextdom.c \
+ dcgettext.c \
+ dgettext.c \
+ gettext.c \
+ finddomain.c \
+ loadmsgcat.c \
+ localealias.c \
+ textdomain.c \
+ l10nflist.c \
+ explodename.c \
+ dcigettext.c \
+ dcngettext.c \
+ dngettext.c \
+ ngettext.c \
+ plural.y \
+ plural-exp.c \
+ localcharset.c \
+ relocatable.c \
+ localename.c \
+ log.c \
+ printf.c \
+ osdep.c \
+ os2compat.c \
+ intl-compat.c
+OBJECTS = \
+ bindtextdom.$lo \
+ dcgettext.$lo \
+ dgettext.$lo \
+ gettext.$lo \
+ finddomain.$lo \
+ loadmsgcat.$lo \
+ localealias.$lo \
+ textdomain.$lo \
+ l10nflist.$lo \
+ explodename.$lo \
+ dcigettext.$lo \
+ dcngettext.$lo \
+ dngettext.$lo \
+ ngettext.$lo \
+ plural.$lo \
+ plural-exp.$lo \
+ localcharset.$lo \
+ relocatable.$lo \
+ localename.$lo \
+ log.$lo \
+ printf.$lo \
+ osdep.$lo \
+ intl-compat.$lo
DISTFILES.common = Makefile.in \
config.charset locale.alias ref-add.sin ref-del.sin $(HEADERS) $(SOURCES)
DISTFILES.generated = plural.c
DISTFILES.normal = VERSION
-DISTFILES.gettext = COPYING.LIB-2.0 COPYING.LIB-2.1 libintl.glibc
+DISTFILES.gettext = COPYING.LIB-2.0 COPYING.LIB-2.1 libintl.glibc \
+libgnuintl.h_vms Makefile.vms \
+libgnuintl.h.msvc-static libgnuintl.h.msvc-shared README.woe32 Makefile.msvc
DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c \
-COPYING.LIB-2 gettext.h libgettext.h plural-eval.c
-
-# Libtool's library version information for libintl.
-# Before making a gettext release, the gettext maintainer must change this
-# according to the libtool documentation, section "Library interface versions".
-# Maintainers of other packages that include the intl directory must *not*
-# change these values.
-LTV_CURRENT=4
-LTV_REVISION=0
-LTV_AGE=2
-
-.SUFFIXES:
-.SUFFIXES: .c .y .o .lo .sin .sed
-.c.o:
- @echo " CC $<"
- @$(COMPILE) $<
-.c.lo:
- $(LIBTOOL) --mode=compile $(COMPILE) $<
-
-.y.c:
- $(YACC) $(YFLAGS) --output $@ $<
- rm -f $*.h
-
-.sin.sed:
- sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $< > t-$@
- mv t-$@ $@
-
-INCLUDES = -I.. -I. -I$(top_srcdir)/intl
+COPYING.LIB-2 gettext.h libgettext.h plural-eval.c libgnuintl.h
all: all-@USE_INCLUDED_LIBINTL@
all-yes: libintl.$la libintl.h charset.alias ref-add.sed ref-del.sed
all-no-no:
libintl.a libgnuintl.a: $(OBJECTS)
- @echo " GEN_LIB $<"
@rm -f $@
+ @echo " AR $@"
@$(AR) cru $@ $(OBJECTS)
+ @echo " RANLIB $@"
@$(RANLIB) $@
libintl.la libgnuintl.la: $(OBJECTS)
$(LIBTOOL) --mode=link \
$(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \
- $(OBJECTS) @LTLIBICONV@ -lc \
+ $(OBJECTS) @LTLIBICONV@ $(LIBS) -lc \
-version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \
-rpath $(libdir) \
-no-undefined
+# Libtool's library version information for libintl.
+# Before making a gettext release, the gettext maintainer must change this
+# according to the libtool documentation, section "Library interface versions".
+# Maintainers of other packages that include the intl directory must *not*
+# change these values.
+LTV_CURRENT=7
+LTV_REVISION=0
+LTV_AGE=4
+
+.SUFFIXES:
+.SUFFIXES: .c .y .o .lo .sin .sed
+
+.c.o:
+ @echo " CC $<"
+ @$(COMPILE) $<
+
+.y.c:
+ $(YACC) $(YFLAGS) --output $@ $<
+ rm -f $*.h
+
+bindtextdom.lo: $(srcdir)/bindtextdom.c
+ $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/bindtextdom.c
+dcgettext.lo: $(srcdir)/dcgettext.c
+ $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcgettext.c
+dgettext.lo: $(srcdir)/dgettext.c
+ $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dgettext.c
+gettext.lo: $(srcdir)/gettext.c
+ $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/gettext.c
+finddomain.lo: $(srcdir)/finddomain.c
+ $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/finddomain.c
+loadmsgcat.lo: $(srcdir)/loadmsgcat.c
+ $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/loadmsgcat.c
+localealias.lo: $(srcdir)/localealias.c
+ $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localealias.c
+textdomain.lo: $(srcdir)/textdomain.c
+ $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/textdomain.c
+l10nflist.lo: $(srcdir)/l10nflist.c
+ $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/l10nflist.c
+explodename.lo: $(srcdir)/explodename.c
+ $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/explodename.c
+dcigettext.lo: $(srcdir)/dcigettext.c
+ $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcigettext.c
+dcngettext.lo: $(srcdir)/dcngettext.c
+ $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcngettext.c
+dngettext.lo: $(srcdir)/dngettext.c
+ $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dngettext.c
+ngettext.lo: $(srcdir)/ngettext.c
+ $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/ngettext.c
+plural.lo: $(srcdir)/plural.c
+ $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/plural.c
+plural-exp.lo: $(srcdir)/plural-exp.c
+ $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/plural-exp.c
+localcharset.lo: $(srcdir)/localcharset.c
+ $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localcharset.c
+relocatable.lo: $(srcdir)/relocatable.c
+ $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/relocatable.c
+localename.lo: $(srcdir)/localename.c
+ $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localename.c
+log.lo: $(srcdir)/log.c
+ $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/log.c
+printf.lo: $(srcdir)/printf.c
+ $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/printf.c
+osdep.lo: $(srcdir)/osdep.c
+ $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/osdep.c
+intl-compat.lo: $(srcdir)/intl-compat.c
+ $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/intl-compat.c
+
+ref-add.sed: $(srcdir)/ref-add.sin
+ @echo " SED ref-add.sed"
+ @sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-add.sin > t-ref-add.sed
+ @mv t-ref-add.sed ref-add.sed
+ref-del.sed: $(srcdir)/ref-del.sin
+ @echo " SED ref-del.sed"
+ @sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-del.sin > t-ref-del.sed
+ @mv t-ref-del.sed ref-del.sed
+
+INCLUDES = -I. -I$(srcdir) -I..
+
+libgnuintl.h: $(srcdir)/libgnuintl.h.in
+ @echo " SED libgnuintl.h "
+ @sed -e 's,@''HAVE_POSIX_PRINTF''@,@HAVE_POSIX_PRINTF@,g' \
+ -e 's,@''HAVE_ASPRINTF''@,@HAVE_ASPRINTF@,g' \
+ -e 's,@''HAVE_SNPRINTF''@,@HAVE_SNPRINTF@,g' \
+ -e 's,@''HAVE_WPRINTF''@,@HAVE_WPRINTF@,g' \
+ < $(srcdir)/libgnuintl.h.in > libgnuintl.h
+
libintl.h: libgnuintl.h
- cp $(srcdir)/libgnuintl.h libintl.h
+ @echo " CP libintl.h"
+ @cp libgnuintl.h libintl.h
-charset.alias: config.charset
- $(SHELL) $(srcdir)/config.charset '@host@' > t-$@
- mv t-$@ $@
+charset.alias: $(srcdir)/config.charset
+ @echo " CONFIG.CHARSET $@"
+ @$(SHELL) $(srcdir)/config.charset '@host@' > t-$@
+ @mv t-$@ $@
check: all
-# This installation goal is only used in GNU gettext. Packages which
-# only use the library should use install instead.
-
# We must not install the libintl.h/libintl.a files if we are on a
# system which has the GNU gettext() function in its C library or in a
# separate library.
# package, you have to use `configure --with-included-gettext'.
install: install-exec install-data
install-exec: all
- if test "$(PACKAGE)" = "gettext" \
- && test '@INTLOBJS@' = '$(GETTOBJS)'; then \
+ @if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
+ && test '@USE_INCLUDED_LIBINTL@' = yes; then \
$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
$(INSTALL_DATA) libintl.h $(DESTDIR)$(includedir)/libintl.h; \
$(LIBTOOL) --mode=install \
$(INSTALL_DATA) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \
+ if test "@RELOCATABLE@" = yes; then \
+ dependencies=`sed -n -e 's,^dependency_libs=\(.*\),\1,p' < $(DESTDIR)$(libdir)/libintl.la | sed -e "s,^',," -e "s,'\$$,,"`; \
+ if test -n "$$dependencies"; then \
+ rm -f $(DESTDIR)$(libdir)/libintl.la; \
+ fi; \
+ fi; \
+ else \
+ : ; \
+ fi
+ @if test "$(PACKAGE)" = "gettext-tools" \
+ && test '@USE_INCLUDED_LIBINTL@' = no; then \
+ $(mkinstalldirs) $(DESTDIR)$(libdir); \
+ $(LIBTOOL) --mode=install \
+ $(INSTALL_DATA) libgnuintl.$la $(DESTDIR)$(libdir)/libgnuintl.$la; \
+ rm -f $(DESTDIR)$(libdir)/preloadable_libintl.so; \
+ $(INSTALL_DATA) $(DESTDIR)$(libdir)/libgnuintl.so $(DESTDIR)$(libdir)/preloadable_libintl.so; \
+ $(LIBTOOL) --mode=uninstall \
+ rm -f $(DESTDIR)$(libdir)/libgnuintl.$la; \
else \
: ; \
fi
: ; \
fi
install-data: all
- if test "$(PACKAGE)" = "gettext"; then \
+ @if test "$(PACKAGE)" = "gettext-tools"; then \
$(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
$(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \
$(INSTALL_DATA) ChangeLog.inst $(DESTDIR)$(gettextsrcdir)/ChangeLog; \
install-strip: install
installdirs:
- if test "$(PACKAGE)" = "gettext" \
- && test '@INTLOBJS@' = '$(GETTOBJS)'; then \
+ if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
+ && test '@USE_INCLUDED_LIBINTL@' = yes; then \
$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
else \
: ; \
fi
+ if test "$(PACKAGE)" = "gettext-tools" \
+ && test '@USE_INCLUDED_LIBINTL@' = no; then \
+ $(mkinstalldirs) $(DESTDIR)$(libdir); \
+ else \
+ : ; \
+ fi
if test '@USE_INCLUDED_LIBINTL@' = yes; then \
test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \
$(mkinstalldirs) $(DESTDIR)$(localedir); \
else \
: ; \
fi
- if test "$(PACKAGE)" = "gettext"; then \
+ if test "$(PACKAGE)" = "gettext-tools"; then \
$(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
else \
: ; \
install-shlibs:
+install-shlibs-strip:
+
uninstall:
- if test "$(PACKAGE)" = "gettext" \
- && test '@INTLOBJS@' = '$(GETTOBJS)'; then \
+ if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
+ && test '@USE_INCLUDED_LIBINTL@' = yes; then \
rm -f $(DESTDIR)$(includedir)/libintl.h; \
$(LIBTOOL) --mode=uninstall \
rm -f $(DESTDIR)$(libdir)/libintl.$la; \
else \
: ; \
fi
+ if test "$(PACKAGE)" = "gettext-tools" \
+ && test '@USE_INCLUDED_LIBINTL@' = no; then \
+ rm -f $(DESTDIR)$(libdir)/preloadable_libintl.so; \
+ else \
+ : ; \
+ fi
if test '@USE_INCLUDED_LIBINTL@' = yes; then \
if test -f $(DESTDIR)$(libdir)/charset.alias; then \
temp=$(DESTDIR)$(libdir)/t-charset.alias; \
else \
: ; \
fi
- if test "$(PACKAGE)" = "gettext"; then \
+ if test "$(PACKAGE)" = "gettext-tools"; then \
for file in VERSION ChangeLog COPYING.LIB-2.0 COPYING.LIB-2.1 $(DISTFILES.common) $(DISTFILES.generated); do \
rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
done; \
: ; \
fi
-info dvi:
+info dvi ps pdf html:
$(OBJECTS): libgnuintl.h
-bindtextdom.$lo dcgettext.$lo dcigettext.$lo dcngettext.$lo dgettext.$lo dngettext.$lo finddomain.$lo gettext.$lo intl-compat.$lo loadmsgcat.$lo localealias.$lo ngettext.$lo textdomain.$lo: gettextP.h gmo.h loadinfo.h
-dcigettext.$lo: hash-string.h
-explodename.$lo l10nflist.$lo: loadinfo.h
-dcigettext.$lo loadmsgcat.$lo plural.$lo plural-exp.$lo: plural-exp.h
-dcigettext.$lo: eval-plural.h
+bindtextdom.$lo dcgettext.$lo dcigettext.$lo dcngettext.$lo dgettext.$lo dngettext.$lo finddomain.$lo gettext.$lo intl-compat.$lo loadmsgcat.$lo localealias.$lo ngettext.$lo textdomain.$lo: $(srcdir)/gettextP.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h
+dcigettext.$lo loadmsgcat.$lo: $(srcdir)/hash-string.h
+explodename.$lo l10nflist.$lo: $(srcdir)/loadinfo.h
+dcigettext.$lo loadmsgcat.$lo plural.$lo plural-exp.$lo: $(srcdir)/plural-exp.h
+dcigettext.$lo: $(srcdir)/eval-plural.h
+localcharset.$lo: $(srcdir)/localcharset.h
+localealias.$lo localcharset.$lo relocatable.$lo: $(srcdir)/relocatable.h
+printf.$lo: $(srcdir)/printf-args.h $(srcdir)/printf-args.c $(srcdir)/printf-parse.h $(srcdir)/wprintf-parse.h $(srcdir)/xsize.h $(srcdir)/printf-parse.c $(srcdir)/vasnprintf.h $(srcdir)/vasnwprintf.h $(srcdir)/vasnprintf.c
tags: TAGS
TAGS: $(HEADERS) $(SOURCES)
here=`pwd`; cd $(srcdir) && etags -o $$here/TAGS $(HEADERS) $(SOURCES)
+ctags: CTAGS
+
+CTAGS: $(HEADERS) $(SOURCES)
+ here=`pwd`; cd $(srcdir) && ctags -o $$here/CTAGS $(HEADERS) $(SOURCES)
+
id: ID
ID: $(HEADERS) $(SOURCES)
mostlyclean:
- rm -f *.a *.la *.o *.lo core core.*
- rm -f libintl.h charset.alias ref-add.sed ref-del.sed
+ rm -f *.a *.la *.o *.obj *.lo core core.*
+ rm -f libgnuintl.h libintl.h charset.alias ref-add.sed ref-del.sed
rm -f -r .libs _libs
clean: mostlyclean
distclean: clean
rm -f Makefile ID TAGS
- if test "$(PACKAGE)" = gettext; then \
+ if test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; then \
rm -f ChangeLog.inst $(DISTFILES.normal); \
else \
: ; \
# other files which should not be distributed in other packages.
distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
dist distdir: Makefile
- if test "$(PACKAGE)" = gettext; then \
- additional="$(DISTFILES.gettext)"; \
+ if test "$(PACKAGE)" = "gettext-tools"; then \
+ : ; \
else \
- additional="$(DISTFILES.normal)"; \
- fi; \
- $(MAKE) $(DISTFILES.common) $(DISTFILES.generated) $$additional; \
- for file in ChangeLog $(DISTFILES.common) $(DISTFILES.generated) $$additional; do \
- if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
- cp -p $$dir/$$file $(distdir); \
- done
-
-Makefile: Makefile.in ../config.status
- cd .. \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ if test "$(PACKAGE)" = "gettext-runtime"; then \
+ additional="$(DISTFILES.gettext)"; \
+ else \
+ additional="$(DISTFILES.normal)"; \
+ fi; \
+ $(MAKE) $(DISTFILES.common) $(DISTFILES.generated) $$additional; \
+ for file in ChangeLog $(DISTFILES.common) $(DISTFILES.generated) $$additional; do \
+ if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
+ cp -p $$dir/$$file $(distdir); \
+ done; \
+ fi
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+# cd $(top_builddir) && $(SHELL) ./config.status
+# This would be more efficient, but doesn't work any more with autoconf-2.57,
+# when AC_CONFIG_FILES([intl/Makefile:somedir/Makefile.in]) is used.
+ cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
# Tell versions [3.59,3.63) of GNU make not to export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
2004-12-14 Theodore Ts'o <tytso@mit.edu>
+ * Makefile.elf-lib, Makefile.solaris-lib, Makefile.profile,
+ Makefile.darwin-lib: Use Linux-kernel-style makefile
+ output for "make install".
+
+ * Makefile.elf-lib, Makefile.solaris-lib: Move strip command to
+ install-strip and install-shlibs-strip.
+
* Makefile.elf-lib (installdirs-elf-lib),
- solaris-lib (installdirs-elf-lib): Use $(MKINSTALLDIRS) macro
+ Makefile.solaris-lib (installdirs-elf-lib): Use $(MKINSTALLDIRS)
+ macro
2004-11-30 Theodore Ts'o <tytso@mit.edu>
$(LN) $(BSD_LIB) ../$(BSD_LIB)
install-shlibs install:: $(BSD_LIB)
- $(INSTALL_PROGRAM) $(BSD_LIB) \
+ @echo " INSTALL_PROGRAM $(BSDLIB_INSTALL_DIR)/$(BSD_LIB)"
+ @$(INSTALL_PROGRAM) $(BSD_LIB) \
$(DESTDIR)$(BSDLIB_INSTALL_DIR)/$(BSD_LIB)
- -$(LDCONFIG)
+ @-$(LDCONFIG)
+
+install-strip: install
+
+install-shlibs-strip: install-shlibs
uninstall-shlibs uninstall::
$(RM) -f $(DESTDIR)$(BSDLIB_INSTALL_DIR)/$(BSD_LIB)
@$(LN) ../$(BSD_LIB) ../$(BSDLIB_IMAGE).dylib
install-shlibs install:: $(BSD_LIB)
- $(INSTALL_PROGRAM) $(BSD_LIB) \
+ @echo " INSTALL_PROGRAM $(BSDLIB_INSTALL_DIR)/$(BSD_LIB)"
+ @$(INSTALL_PROGRAM) $(BSD_LIB) \
$(DESTDIR)$(BSDLIB_INSTALL_DIR)/$(BSD_LIB)
- -$(LDCONFIG)
+ @-$(LDCONFIG)
+
+install-strip: install
+
+install-shlibs-strip: install-shlibs
uninstall-shlibs uninstall::
$(RM) -f $(DESTDIR)$(BSDLIB_INSTALL_DIR)/$(BSD_LIB)
@$(LN) ../$(ELF_LIB) ../$(ELF_SONAME)
installdirs-elf-lib::
- $(MKINSTALLDIRS) $(DESTDIR)$(ELF_INSTALL_DIR) \
+ @echo " MKINSTALLDIRS $(ELF_INSTALL_DIR) $(libdir)"
+ @$(MKINSTALLDIRS) $(DESTDIR)$(ELF_INSTALL_DIR) \
$(DESTDIR)$(libdir)
installdirs:: installdirs-elf-lib
install-shlibs install:: $(ELF_LIB) installdirs-elf-lib
- $(INSTALL_PROGRAM) $(ELF_LIB) $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB)
- $(STRIP) --strip-debug \
- $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB)
- $(LN_S) -f $(ELF_LIB) $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_SONAME)
- $(LN_S) -f $(ELF_INSTALL_DIR)/$(ELF_SONAME) \
+ @echo " INSTALL-ELF-LIB $(ELF_INSTALL_DIR)/$(ELF_LIB)"
+ @$(INSTALL_PROGRAM) $(ELF_LIB) $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB)
+ @echo " SYMLINK $(ELF_INSTALL_DIR)/$(ELF_SONAME)"
+ @$(LN_S) -f $(ELF_LIB) $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_SONAME)
+ @echo " SYMLINK $(libdir)/$(ELF_IMAGE).so"
+ @$(LN_S) -f $(ELF_INSTALL_DIR)/$(ELF_SONAME) \
$(DESTDIR)$(libdir)/$(ELF_IMAGE).so
- -$(LDCONFIG)
+ @echo " LDCONFIG"
+ @-$(LDCONFIG)
+
+install-strip: install
+ @echo " STRIP-LIB $(ELF_INSTALL_DIR)/$(ELF_LIB)"
+ @$(STRIP) --strip-unneeded --remove-section=.comment \
+ --remove-section=.note $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB)
+
+install-shlibs-strip: install-shlibs
+ @echo " STRIP-LIB $(ELF_INSTALL_DIR)/$(ELF_LIB)"
+ @$(STRIP) --strip-unneeded --remove-section=.comment \
+ --remove-section=.note $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB)
uninstall-shlibs uninstall::
$(RM) -f $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB) \
@$(LN) $@ ../$@
install:: $(LIBRARY)_p.a installdirs
- $(INSTALL_DATA) $(LIBRARY)_p.a $(DESTDIR)$(libdir)/$(LIBRARY)_p.a
- $(CHMOD) 644 $(DESTDIR)$(libdir)/$(LIBRARY)_p.a
- -$(RANLIB) $(DESTDIR)$(libdir)/$(LIBRARY)_p.a
- $(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/$(LIBRARY)_p.a
+ @echo " INSTALL_DATA $(libdir)/$(LIBRARY)_p.a"
+ @$(INSTALL_DATA) $(LIBRARY)_p.a $(DESTDIR)$(libdir)/$(LIBRARY)_p.a
+ @-$(RANLIB) $(DESTDIR)$(libdir)/$(LIBRARY)_p.a
+ @$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/$(LIBRARY)_p.a
uninstall::
$(RM) -f $(DESTDIR)$(libdir)/$(LIBRARY)_p.a
install-shlibs install:: $(ELF_LIB) installdirs-elf-lib
$(INSTALL_PROGRAM) $(ELF_LIB) $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB)
- $(STRIP) -x \
- $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB)
$(LN_S) -f $(ELF_LIB) $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_SONAME)
$(LN_S) -f $(ELF_INSTALL_DIR)/$(ELF_SONAME) \
$(DESTDIR)$(libdir)/$(ELF_IMAGE).so
-$(LDCONFIG)
+install-strip: install
+ $(STRIP) -x $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB)
+
+install-shlibs-strip: install-shlibs
+ $(STRIP) -x $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB)
+
uninstall-shlibs uninstall::
$(RM) -f $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB) \
$(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_SONAME) \
2004-12-14 Theodore Ts'o <tytso@mit.edu>
+ * Makefile.in: Use Linux-kernel-style makefile output for "make
+ install"
+
* Makefile.in (installdirs): Use $(MKINSTALLDIRS) macro
2004-11-30 Theodore Ts'o <tytso@mit.edu>
tst_read tst_resolve tst_save
installdirs::
- $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
+ @echo " MKINSTALLDIRS $(libdir) $(includedir)/blkid"
+ @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
$(DESTDIR)$(includedir)/blkid
install:: all installdirs
- $(INSTALL_DATA) libblkid.a $(DESTDIR)$(libdir)/libblkid.a
- $(CHMOD) 644 $(DESTDIR)$(libdir)/libblkid.a
- -$(RANLIB) $(DESTDIR)$(libdir)/libblkid.a
- $(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libblkid.a
- set -e; for i in $(HFILES); do \
+ @echo " INSTALL_DATA $(libdir)/libblkid.a"
+ @$(INSTALL_DATA) libblkid.a $(DESTDIR)$(libdir)/libblkid.a
+ @-$(RANLIB) $(DESTDIR)$(libdir)/libblkid.a
+ @$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libblkid.a
+ @set -e; for i in $(HFILES); do \
+ echo " INSTALL_DATA $(includedir)/blkid/$$i"; \
$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)/blkid/$$i; \
done
- set -e; for i in $(HFILES_IN); do \
+ @set -e; for i in $(HFILES_IN); do \
+ echo " INSTALL_DATA $(includedir)/blkid/$$i"; \
$(INSTALL_DATA) $$i $(DESTDIR)$(includedir)/blkid/$$i; \
done
- for i in $(SMANPAGES); do \
+ @for i in $(SMANPAGES); do \
+ echo " INSTALL_DATA $(man3dir)/$$i"; \
$(INSTALL_DATA) $$i $(DESTDIR)$(man3dir)/$$i; \
done
2004-12-14 Theodore Ts'o <tytso@mit.edu>
+ * Makefile.in: Use Linux-kernel-style makefile output for "make
+ install"
+
* Makefile.in (installdirs): Use $(MKINSTALLDIRS) macro
2004-11-30 Theodore Ts'o <tytso@mit.edu>
@BSDLIB_CMT@ @$(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
installdirs::
- $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
+ @echo " MKINSTALLDIRS $(libdir) $(includedir)/e2p"
+ @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
$(DESTDIR)$(includedir)/e2p
install:: all installdirs
- $(INSTALL_DATA) libe2p.a $(DESTDIR)$(libdir)/libe2p.a
- $(CHMOD) 644 $(DESTDIR)$(libdir)/libe2p.a
- -$(RANLIB) $(DESTDIR)$(libdir)/libe2p.a
- $(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libe2p.a
- set -e; for i in $(HFILES); do \
+ @echo " INSTALL_DATA $(libdir)/libe2p.a"
+ @$(INSTALL_DATA) libe2p.a $(DESTDIR)$(libdir)/libe2p.a
+ @-$(RANLIB) $(DESTDIR)$(libdir)/libe2p.a
+ @$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libe2p.a
+ @set -e; for i in $(HFILES); do \
+ echo " INSTALL_DATA $(includedir)/e2p/$$i"; \
$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)/e2p/$$i; \
done
2004-12-14 Theodore Ts'o <tytso@mit.edu>
+ * Makefile.in: Use Linux-kernel-style makefile output for "make
+ install"
+
* Makefile.in (installdirs): Use $(MKINSTALLDIRS) macro
2004-11-30 Theodore Ts'o <tytso@mit.edu>
$(TAGS) $(SRCS)
installdirs::
- $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
+ @echo " MKINSTALLDIRS $(libdir) $(includedir)/et $(datadir)/et $(bindir) $(man1dir) $(man3dir)"
+ @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
$(DESTDIR)$(includedir)/et $(DESTDIR)$(datadir)/et \
$(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) \
$(DESTDIR)$(man3dir)
install:: compile_et libcom_err.a $(HFILES) installdirs
- $(INSTALL_DATA) libcom_err.a $(DESTDIR)$(libdir)/libcom_err.a
- $(CHMOD) 644 $(DESTDIR)$(libdir)/libcom_err.a
- -$(RANLIB) $(DESTDIR)$(libdir)/libcom_err.a
- $(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libcom_err.a
- for i in $(HFILES); do \
+ @echo " INSTALL_DATA $(libdir)/libcom_err.a"
+ @$(INSTALL_DATA) libcom_err.a $(DESTDIR)$(libdir)/libcom_err.a
+ @-$(RANLIB) $(DESTDIR)$(libdir)/libcom_err.a
+ @$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libcom_err.a
+ @for i in $(HFILES); do \
+ echo " INSTALL_DATA $(includedir)/et/$$i"; \
$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)/et/$$i; \
done
- for i in $(SHARE_FILES); do \
+ @for i in $(SHARE_FILES); do \
+ echo " INSTALL_DATA $(datadir)/et/$$i"; \
$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(datadir)/et/$$i; \
done
- $(INSTALL) compile_et $(DESTDIR)$(bindir)/compile_et
- $(INSTALL_DATA) $(srcdir)/com_err.3 $(DESTDIR)$(man3dir)/com_err.3
- $(INSTALL_DATA) $(srcdir)/compile_et.1 \
+ @echo " INSTALL_SCRIPT $(bindir)/compile_et"
+ @$(INSTALL_SCRIPT) compile_et $(DESTDIR)$(bindir)/compile_et
+ @echo " INSTALL_DATA $(man3dir)/com_err.3"
+ @$(INSTALL_DATA) $(srcdir)/com_err.3 $(DESTDIR)$(man3dir)/com_err.3
+ @echo " INSTALL_DATA $(man1dir)/compile_et.1"
+ @$(INSTALL_DATA) $(srcdir)/compile_et.1 \
$(DESTDIR)$(man1dir)/compile_et.1
uninstall::
2004-12-14 Theodore Ts'o <tytso@mit.edu>
+ * Makefile.in: Use Linux-kernel-style makefile output for "make
+ install"
+
* Makefile.in (installdirs): Use $(MKINSTALLDIRS) macro
Update dependencies.
@SWAPFS_CMT@ LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_byteswap
installdirs::
- $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
+ @echo " MKINSTALLDIRS $(libdir) $(includedir)/ext2fs"
+ @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
$(DESTDIR)$(includedir)/ext2fs
install:: all $(HFILES) $(HFILES_IN) installdirs
- $(INSTALL_DATA) libext2fs.a $(DESTDIR)$(libdir)/libext2fs.a
- $(CHMOD) 644 $(DESTDIR)$(libdir)/libext2fs.a
- -$(RANLIB) $(DESTDIR)$(libdir)/libext2fs.a
- $(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libext2fs.a
- for i in $(HFILES); do \
+ @echo " INSTALL_DATA $(libdir)/libext2fs.a"
+ @$(INSTALL_DATA) libext2fs.a $(DESTDIR)$(libdir)/libext2fs.a
+ @-$(RANLIB) $(DESTDIR)$(libdir)/libext2fs.a
+ @$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libext2fs.a
+ @for i in $(HFILES); do \
+ echo " INSTALL_DATA $(includedir)/ext2fs/$$i"; \
$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)/ext2fs/$$i; \
done
- for i in $(HFILES_IN); do \
+ @for i in $(HFILES_IN); do \
+ echo " INSTALL_DATA $(includedir)/ext2fs/$$i"; \
$(INSTALL_DATA) $$i $(DESTDIR)$(includedir)/ext2fs/$$i; \
done
2004-12-14 Theodore Ts'o <tytso@mit.edu>
+ * Makefile.in: Use Linux-kernel-style makefile output for "make
+ install"
+
* Makefile.in (installdirs): Use $(MKINSTALLDIRS) macro
Update dependencies.
@$(CHMOD) +x mk_cmds
installdirs::
- $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
+ @echo " MKINSTALLDIRS $(libdir) $(includedir)/ss $(datadir)/ss $(bindir)"
+ @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
$(DESTDIR)$(includedir)/ss $(DESTDIR)$(datadir)/ss \
$(DESTDIR)$(bindir)
install:: libss.a $(INSTALL_HFILES) installdirs ss_err.h mk_cmds
- $(INSTALL_DATA) libss.a $(DESTDIR)$(libdir)/libss.a
- $(CHMOD) 644 $(DESTDIR)$(libdir)/libss.a
- -$(RANLIB) $(DESTDIR)$(libdir)/libss.a
- $(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libss.a
- $(RM) -f $(DESTDIR)$(includedir)/ss/*
- for i in $(INSTALL_HFILES); do \
+ @echo " INSTALL_DATA $(DESTDIR)$(libdir)/libss.a"
+ @$(INSTALL_DATA) libss.a $(DESTDIR)$(libdir)/libss.a
+ @-$(RANLIB) $(DESTDIR)$(libdir)/libss.a
+ @$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libss.a
+ @$(RM) -f $(DESTDIR)$(includedir)/ss/*
+ @for i in $(INSTALL_HFILES); do \
+ echo " INSTALL_DATA $(DESTDIR)$(includedir)/ss/$$i"; \
$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)/ss/$$i; \
done
- $(INSTALL_DATA) ss_err.h $(DESTDIR)$(includedir)/ss/ss_err.h
- for i in $(SHARE_FILES); do \
+ @echo " INSTALL_DATA $(includedir)/ss/ss_err.h"
+ @$(INSTALL_DATA) ss_err.h $(DESTDIR)$(includedir)/ss/ss_err.h
+ @for i in $(SHARE_FILES); do \
+ echo " INSTALL_DATA $(DESTDIR)$(datadir)/ss/$$i"; \
$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(datadir)/ss/$$i; \
done
- $(INSTALL) mk_cmds $(DESTDIR)$(bindir)/mk_cmds
- $(INSTALL_DATA) $(srcdir)/mk_cmds.1 $(DESTDIR)$(man1dir)/mk_cmds.1
+ @echo " INSTALL $(bindir)/mk_cmds"
+ @$(INSTALL) mk_cmds $(DESTDIR)$(bindir)/mk_cmds
+ @echo " INSTALL_DATA $(man1dir)/mk_cmds.1"
+ @$(INSTALL_DATA) $(srcdir)/mk_cmds.1 $(DESTDIR)$(man1dir)/mk_cmds.1
uninstall::
$(RM) -f $(DESTDIR)$(libdir)/libss.a $(DESTDIR)$(bindir)/mk_cmds
2004-12-14 Theodore Ts'o <tytso@mit.edu>
+ * Makefile.in: Use Linux-kernel-style makefile output for "make
+ install"
+
* Makefile.in (installdirs): Use $(MKINSTALLDIRS) macro.
Update dependencies.
@$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_unparse.3.in uuid_unparse.3
installdirs::
- $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
+ @echo " MKINSTALLDIRS $(libdir) $(includedir)/uuid $(man3dir)"
+ @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
$(DESTDIR)$(includedir)/uuid $(DESTDIR)$(man3dir)
install:: all installdirs
- $(INSTALL_DATA) libuuid.a $(DESTDIR)$(libdir)/libuuid.a
- $(CHMOD) 644 $(DESTDIR)$(libdir)/libuuid.a
- -$(RANLIB) $(DESTDIR)$(libdir)/libuuid.a
- $(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libuuid.a
- $(INSTALL_DATA) $(srcdir)/uuid.h $(DESTDIR)$(includedir)/uuid/uuid.h
- for i in $(SMANPAGES); do \
+ @echo " INSTALL_DATA $(libdir)/libuuid.a"
+ @$(INSTALL_DATA) libuuid.a $(DESTDIR)$(libdir)/libuuid.a
+ @-$(RANLIB) $(DESTDIR)$(libdir)/libuuid.a
+ @$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libuuid.a
+ @echo " INSTALL_DATA $(includedir)/uuid/uuid.h"
+ @$(INSTALL_DATA) $(srcdir)/uuid.h $(DESTDIR)$(includedir)/uuid/uuid.h
+ @for i in $(SMANPAGES); do \
$(RM) -f $(DESTDIR)$(man3dir)/$$i.gz; \
+ echo " INSTALL_DATA $(man3dir)/$$i"; \
$(INSTALL_DATA) $$i $(DESTDIR)$(man3dir)/$$i; \
done
- $(RM) -f $(DESTDIR)$(man3dir)/uuid_generate_random.3.gz \
+ @$(RM) -f $(DESTDIR)$(man3dir)/uuid_generate_random.3.gz \
$(DESTDIR)$(man3dir)/uuid_generate_time.3.gz
- $(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_random.3
- $(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_time.3
+ @echo " LINK $(man3dir)/uuid_generate_random.3"
+ @$(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_random.3
+ @echo " LINK $(man3dir)/uuid_generate_time.3"
+ @$(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_time.3
uninstall::
$(RM) -f $(DESTDIR)$(libdir)/libuuid.a
2004-12-14 Theodore Ts'o <tytso@mit.edu>
+ * Makefile.in: Move strip command to install-strip target.
+ Use Linux-kernel-style makefile output for "make install"
+
* Makefile.in (installdirs): Use $(MKINSTALLDIRS) macro
2004-12-01 Theodore Ts'o <tytso@mit.edu>
@$(SUBSTITUTE_UPTIME) $(srcdir)/filefrag.8.in filefrag.8
installdirs:
- $(MKINSTALLDIRS) $(DESTDIR)$(sbindir) \
+ @echo " MKINSTALLDIRS $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir)"
+ @$(MKINSTALLDIRS) $(DESTDIR)$(sbindir) \
$(DESTDIR)$(root_sbindir) $(DESTDIR)$(bindir) \
$(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) $(DESTDIR)$(libdir)
install: all $(SMANPAGES) $(UMANPAGES) installdirs
- for i in $(SPROGS); do \
+ @for i in $(SPROGS); do \
+ echo " INSTALL $(root_sbindir)/$$i"; \
$(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \
- $(STRIP) $(DESTDIR)$(root_sbindir)/$$i; \
done
- for i in $(USPROGS); do \
+ @for i in $(USPROGS); do \
+ echo " INSTALL $(sbindir)/$$i"; \
$(INSTALL_PROGRAM) $$i $(DESTDIR)$(sbindir)/$$i; \
- $(STRIP) $(DESTDIR)$(sbindir)/$$i; \
done
- $(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
+ @echo " LINK $(root_sbindir)/mkfs.ext2"
+ @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
$(DESTDIR)$(root_sbindir)/mkfs.ext2
- $(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
+ @echo " LINK $(root_sbindir)/mkfs.ext3"
+ @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
$(DESTDIR)$(root_sbindir)/mkfs.ext3
- $(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
+ @echo " LINK $(root_sbindir)/e2label"
+ @$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
$(DESTDIR)$(root_sbindir)/e2label
- $(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
+ @echo " LINK $(root_sbindir)/findfs"
+ @$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
$(DESTDIR)$(root_sbindir)/findfs
- for i in $(UPROGS); do \
+ @for i in $(UPROGS); do \
+ echo " INSTALL $(bindir)/$$i"; \
$(INSTALL_PROGRAM) $$i $(DESTDIR)$(bindir)/$$i; \
- $(STRIP) $(DESTDIR)$(bindir)/$$i; \
done
- for i in $(LPROGS); do \
+ @for i in $(LPROGS); do \
+ echo " INSTALL $(libdir)/$$i"; \
$(INSTALL_PROGRAM) $$i $(DESTDIR)$(libdir)/$$i; \
- $(STRIP) $(DESTDIR)$(libdir)/$$i; \
done
- for i in $(SMANPAGES); do \
+ @for i in $(SMANPAGES); do \
for j in $(COMPRESS_EXT); do \
$(RM) -f $(DESTDIR)$(man8dir)/$$i.$$j; \
done; \
+ echo " INSTALL_DATA $(man8dir)/$$i"; \
$(INSTALL_DATA) $$i $(DESTDIR)$(man8dir)/$$i; \
done
- $(RM) -f $(DESTDIR)$(man8dir)/mkfs.ext2.8.gz \
+ @$(RM) -f $(DESTDIR)$(man8dir)/mkfs.ext2.8.gz \
$(DESTDIR)$(man8dir)/mkfs.ext3.8.gz
- $(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 $(DESTDIR)$(man8dir)/mkfs.ext2.8
- $(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 $(DESTDIR)$(man8dir)/mkfs.ext3.8
- for i in $(UMANPAGES); do \
+ @echo " LINK mkfs.ext2.8"
+ @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
+ $(DESTDIR)$(man8dir)/mkfs.ext2.8
+ @echo " LINK mkfs.ext3.8"
+ @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
+ $(DESTDIR)$(man8dir)/mkfs.ext3.8
+ @for i in $(UMANPAGES); do \
$(RM) -f $(DESTDIR)$(man1dir)/$$i.gz; \
+ echo " INSTALL_DATA $(man1dir)/$$i"; \
$(INSTALL_DATA) $$i $(DESTDIR)$(man1dir)/$$i; \
done
+install-strip: install
+ @for i in $(SPROGS); do \
+ echo " STRIP $(root_sbindir)/$$i"; \
+ $(STRIP) $(DESTDIR)$(root_sbindir)/$$i; \
+ done
+ @for i in $(USPROGS); do \
+ echo " STRIP $(sbindir)/$$i"; \
+ $(STRIP) $(DESTDIR)$(sbindir)/$$i; \
+ done
+
uninstall:
for i in $(SPROGS); do \
$(RM) -f $(DESTDIR)$(root_sbindir)/$$i; \
2004-12-14 Theodore Ts'o <tytso@mit.edu>
+ * Makefile.in: Move strip command to install-strip target.
+ Use Linux-kernel-style makefile output for "make install"
+
* Makefile.in (installdirs): Use $(MKINSTALLDIRS) macro
2004-11-30 Theodore Ts'o <tytso@mit.edu>
@$(CC) $(ALL_LDFLAGS) -o test_extent $(TEST_EXTENT_OBJS) $(LIBS)
installdirs:
- $(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
+ @echo " MKINSTALLDIRS $(root_sbindir) $(man8dir)"
+ @$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
$(DESTDIR)$(man8dir)
install: $(PROGS) $(MANPAGES) installdirs
- for i in $(PROGS); do \
+ @for i in $(PROGS); do \
+ echo " INSTALL $(root_sbindir)/$$i"; \
$(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \
- $(STRIP) $(DESTDIR)$(root_sbindir)/$$i; \
done
- for i in $(MANPAGES); do \
+ @for i in $(MANPAGES); do \
for j in $(COMPRESS_EXT); do \
$(RM) -f $(DESTDIR)$(man8dir)/$$i.$$j; \
done; \
+ echo " INSTALL_DATA $(man8dir)/$$i"; \
$(INSTALL_DATA) $$i $(DESTDIR)$(man8dir)/$$i; \
done
+install-strip: install
+ @for i in $(PROGS); do \
+ echo " STRIP $(root_sbindir)/$$i"; \
+ $(STRIP) $(DESTDIR)$(root_sbindir)/$$i; \
+ done
+
uninstall:
for i in $(PROGS); do \
$(RM) -f $(DESTDIR)$(root_sbindir)/$$i; \
+2004-12-14 Theodore Ts'o <tytso@mit.edu>
+
+ * Makefile.in: Add install-strip target
+
2004-11-30 Theodore Ts'o <tytso@mit.edu>
* Makefile.in: Use Linux-kernel-style makefile output to make it
install:
+install-strip:
+
uninstall:
mostlyclean: clean
git://git.whamcloud.com / tools / e2fsprogs.git / commitdiff