Merge from trunk.

1 files changed, 50 insertions, 60 deletions

diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index c5e117f66f9..d271bb3a4fa 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -1,5 +1,5 @@
 # Makefile for lib-src subdirectory in GNU Emacs.
-# Copyright (C) 1985, 1987-1988, 1993-1994, 2001-2011
+# Copyright (C) 1985, 1987-1988, 1993-1994, 2001-2012
 #   Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
@@ -36,14 +36,19 @@ configuration=@configuration@
 EXEEXT=@EXEEXT@
 C_SWITCH_SYSTEM=@C_SWITCH_SYSTEM@
 C_SWITCH_MACHINE=@C_SWITCH_MACHINE@
-C_WARNINGS_SWITCH = @C_WARNINGS_SWITCH@
 PROFILING_CFLAGS = @PROFILING_CFLAGS@
+WARN_CFLAGS = @WARN_CFLAGS@
+WERROR_CFLAGS = @WERROR_CFLAGS@
 
 # Program name transformation.
 TRANSFORM = @program_transform_name@
 
 # ==================== Where To Install Things ====================
 
+# Location to install Emacs.app under GNUstep / Mac OS X.
+# Later values may use this.
+ns_appbindir=@ns_appbindir@
+
 # The default location for installation.  Everything is placed in
 # subdirectories of this directory.  The default values for many of
 # the variables below are expressed in terms of this one, so you may
@@ -101,10 +106,10 @@ gameuser=@gameuser@
 # ../configure figures out the correct values for these.
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 # By default, we uphold the dignity of our programs.
 INSTALL_STRIP =
+MKDIR_P = @MKDIR_P@
 
 # ========================== Lists of Files ===========================
 
@@ -112,8 +117,7 @@ INSTALL_STRIP =
 INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} \
                ebrowse${EXEEXT}
 
-INSTALLABLE_SCRIPTS = rcs-checkin grep-changelog
-STAMP_INST_SCRIPTS = stamp-rcs-checkin stamp-grep-changelog
+INSTALLABLE_SCRIPTS = grep-changelog
 
 # Things that Emacs runs internally, or during the build process,
 #  which should not be installed in bindir.
@@ -124,8 +128,7 @@ DONT_INSTALL= test-distrib${EXEEXT} make-docfile${EXEEXT}
 
 # Like UTILITIES, but they're not system-dependent, and should not be
 #  deleted by the distclean target.
-SCRIPTS= rcs2log vcdiff
-STAMP_SCRIPTS= stamp-rcs2log stamp-vcdiff
+SCRIPTS= rcs2log
 
 # All files that are created by the linker, i.e., whose names end in ${EXEEXT}.
 EXE_FILES = ${INSTALLABLES} ${UTILITIES} ${DONT_INSTALL}
@@ -156,6 +159,8 @@ LIBHESIOD=@LIBHESIOD@
 LIBRESOLV=@LIBRESOLV@
 ## -llockfile if HAVE_LIBLOCKFILE or -lmail if HAVE_LIBMAIL
 LIBS_MAIL=@LIBS_MAIL@
+## empty or -lrt or -lposix4 if HAVE_CLOCK_GETTIME
+LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@
 
 ## Extra libraries to use when linking movemail.
 LIBS_MOVE = $(LIBS_MAIL) $(KRB4LIB) $(DESLIB) $(KRB5LIB) $(CRYPTOLIB) \
@@ -164,42 +169,24 @@ LIBS_MOVE = $(LIBS_MAIL) $(KRB4LIB) $(DESLIB) $(KRB5LIB) $(CRYPTOLIB) \
 ## Some systems define this to request special libraries.
 LIBS_SYSTEM = @LIBS_SYSTEM@
 
-# Those files shared with other GNU utilities need HAVE_CONFIG_H
-# defined before they know they can take advantage of the information
-# in ../src/config.h.
-BASE_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) ${C_WARNINGS_SWITCH} \
-              -DHAVE_CONFIG_H -I. -I../src -I../lib \
+BASE_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) \
+              $(WARN_CFLAGS) $(WERROR_CFLAGS) \
+              -I. -I../src -I../lib \
               -I${srcdir} -I${srcdir}/../src -I${srcdir}/../lib
 
 ALL_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${LDFLAGS} ${CPPFLAGS} ${CFLAGS}
 LINK_CFLAGS = ${BASE_CFLAGS} ${LDFLAGS} ${CFLAGS}
 CPP_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${CPPFLAGS} ${CFLAGS}
 
-all: ${EXE_FILES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS} ${STAMP_INST_SCRIPTS} ${STAMP_SCRIPTS}
-
-LOADLIBES = ../lib/libgnu.a $(LIBS_SYSTEM)
-$(EXE_FILES): ../lib/libgnu.a
-
-## These targets copy the scripts into the build directory so that
-## they can be run from there in an uninstalled Emacs.
-## Nothing to do if pwd = srcdir.
-insrcdir=[ "`/bin/pwd`" = "`(cd $(srcdir) && /bin/pwd)`" ]
-
-stamp-rcs2log: $(srcdir)/rcs2log
-        $(insrcdir) || cp -p $(srcdir)/rcs2log rcs2log
-        touch $@
+# Configuration files for .o files to depend on.
+config_h = ../src/config.h $(srcdir)/../src/conf_post.h
 
-stamp-rcs-checkin: $(srcdir)/rcs-checkin
-        $(insrcdir) || cp -p $(srcdir)/rcs-checkin rcs-checkin
-        touch $@
+all: ${EXE_FILES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS}
 
-stamp-grep-changelog: $(srcdir)/grep-changelog
-        $(insrcdir) || cp -p $(srcdir)/grep-changelog grep-changelog
-        touch $@
+.PHONY: all need-blessmail maybe-blessmail
 
-stamp-vcdiff: $(srcdir)/vcdiff
-        $(insrcdir) || cp -p $(srcdir)/vcdiff vcdiff
-        touch $@
+LOADLIBES = ../lib/libgnu.a $(LIBS_SYSTEM)
+$(EXE_FILES): ../lib/libgnu.a
 
 ## Only used if we need blessmail, but no harm in always defining.
 ## This makes the actual blessmail executable.
@@ -229,46 +216,49 @@ maybe-blessmail: $(BLESSMAIL_TARGET)
 $(DESTDIR)${archlibdir}: all
         @echo
         @echo "Installing utilities run internally by Emacs."
-        umask 022; $(top_srcdir)/build-aux/install-sh -d $(DESTDIR)${archlibdir}
-        if [ `(cd $(DESTDIR)${archlibdir} && /bin/pwd)` != `/bin/pwd` ]; then \
+        umask 022; ${MKDIR_P} $(DESTDIR)${archlibdir}
+        if [ `cd $(DESTDIR)${archlibdir} && /bin/pwd` != `/bin/pwd` ]; then \
           for file in ${UTILITIES}; do \
             $(INSTALL_PROGRAM) $(INSTALL_STRIP) $$file $(DESTDIR)${archlibdir}/$$file ; \
           done ; \
         fi
-        umask 022; $(top_srcdir)/build-aux/install-sh -d $(DESTDIR)${gamedir}; \
+        umask 022; ${MKDIR_P} $(DESTDIR)${gamedir}; \
         touch $(DESTDIR)${gamedir}/snake-scores; \
         touch $(DESTDIR)${gamedir}/tetris-scores
         -if chown ${gameuser} $(DESTDIR)${archlibdir}/update-game-score && chmod u+s $(DESTDIR)${archlibdir}/update-game-score; then \
           chown ${gameuser} $(DESTDIR)${gamedir}; \
           chmod u=rwx,g=rwx,o=rx $(DESTDIR)${gamedir}; \
         fi
-        if [ `(cd $(DESTDIR)${archlibdir} && /bin/pwd)` \
-             != `(cd ${srcdir} && /bin/pwd)` ]; then \
+        if [ `cd $(DESTDIR)${archlibdir} && /bin/pwd` \
+             != `cd ${srcdir} && /bin/pwd` ]; then \
           for file in ${SCRIPTS}; do \
             $(INSTALL_SCRIPT) ${srcdir}/$$file $(DESTDIR)${archlibdir}/$$file; \
           done ; \
         fi
 
+.PHONY: install uninstall mostlyclean clean distclean maintainer-clean
+.PHONY: extraclean check tags
+
 install: $(DESTDIR)${archlibdir}
         @echo
         @echo "Installing utilities for users to run."
+        umask 022; ${MKDIR_P} $(DESTDIR)${bindir}
         for file in ${INSTALLABLES} ; do \
-          $(INSTALL_PROGRAM) $(INSTALL_STRIP) $${file} $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'` ; \
-          chmod a+rx $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'`; \
+          $(INSTALL_PROGRAM) $(INSTALL_STRIP) $${file} $(DESTDIR)${bindir}/`echo $${file} | sed -e 's/${EXEEXT}$$//' -e '$(TRANSFORM)'`${EXEEXT} ; \
         done
         for file in ${INSTALLABLE_SCRIPTS} ; do \
           $(INSTALL_SCRIPT) ${srcdir}/$${file} $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'`  ; \
-          chmod a+rx $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'`; \
         done
 
 uninstall:
-        (cd $(DESTDIR)${bindir}; \
-        for file in ${INSTALLABLES} ${INSTALLABLE_SCRIPTS}; do \
+        for file in ${INSTALLABLES}; do \
+          rm -f $(DESTDIR)${bindir}/`echo $${file} | sed -e 's/${EXEEXT}$$//' -e '$(TRANSFORM)'`${EXEEXT} ; \
+        done
+        for file in ${INSTALLABLE_SCRIPTS}; do \
           rm -f $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'` ; \
-        done)
+        done
         if [ -d $(DESTDIR)${archlibdir} ]; then \
-          (cd $(DESTDIR)${archlibdir} && \
-           rm -f ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS}) \
+          (cd $(DESTDIR)${archlibdir} && rm -f ${UTILITIES} ${SCRIPTS}) \
         fi
 
 mostlyclean:
@@ -276,7 +266,6 @@ mostlyclean:
 
 clean: mostlyclean
         -rm -f ${EXE_FILES}
-        -rm -f ${STAMP_INST_SCRIPTS} ${STAMP_SCRIPTS}
 
 distclean: clean
         -rm -f TAGS
@@ -304,19 +293,19 @@ test-distrib${EXEEXT}: ${srcdir}/test-distrib.c
         $(CC) ${ALL_CFLAGS} -o test-distrib ${srcdir}/test-distrib.c
         ./test-distrib ${srcdir}/testfile
 
-../lib/libgnu.a: ../src/config.h
+../lib/libgnu.a: $(config_h)
         cd ../lib && $(MAKE) libgnu.a
 
-regex.o: $(srcdir)/../src/regex.c $(srcdir)/../src/regex.h ../src/config.h
+regex.o: $(srcdir)/../src/regex.c $(srcdir)/../src/regex.h $(config_h)
         ${CC} -c ${CPP_CFLAGS} -DCONFIG_BROKETS -DINHIBIT_STRING_HEADER \
           ${srcdir}/../src/regex.c
 
-etags${EXEEXT}: ${srcdir}/etags.c regex.o ../src/config.h
+etags${EXEEXT}: ${srcdir}/etags.c regex.o $(config_h)
         $(CC) ${ALL_CFLAGS} -DEMACS_NAME="\"GNU Emacs\"" \
           -DVERSION="\"${version}\"" ${srcdir}/etags.c \
           regex.o $(LOADLIBES) -o etags
 
-ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${srcdir}/../lib/min-max.h ../src/config.h
+ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${srcdir}/../lib/min-max.h $(config_h)
         $(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" \
           ${srcdir}/ebrowse.c $(LOADLIBES) -o ebrowse
 
@@ -327,29 +316,30 @@ ctags${EXEEXT}: etags${EXEEXT}
           -DVERSION="\"${version}\"" ${srcdir}/etags.c \
           regex.o $(LOADLIBES) -o ctags
 
-profile${EXEEXT}: ${srcdir}/profile.c ../src/config.h
-        $(CC) ${ALL_CFLAGS} ${srcdir}/profile.c $(LOADLIBES) -o profile
+profile${EXEEXT}: ${srcdir}/profile.c $(config_h)
+        $(CC) ${ALL_CFLAGS} ${srcdir}/profile.c \
+          $(LOADLIBES) $(LIB_CLOCK_GETTIME) -o profile
 
-make-docfile${EXEEXT}: ${srcdir}/make-docfile.c ../src/config.h
+make-docfile${EXEEXT}: ${srcdir}/make-docfile.c $(config_h)
         $(CC) ${ALL_CFLAGS} ${srcdir}/make-docfile.c $(LOADLIBES) \
           -o make-docfile
 
-movemail${EXEEXT}: ${srcdir}/movemail.c pop.o ../src/config.h
+movemail${EXEEXT}: ${srcdir}/movemail.c pop.o $(config_h)
         $(CC) ${ALL_CFLAGS} ${MOVE_FLAGS} ${srcdir}/movemail.c pop.o \
           $(LOADLIBES) $(LIBS_MOVE) -o movemail
 
-pop.o: ${srcdir}/pop.c ${srcdir}/../lib/min-max.h ../src/config.h
+pop.o: ${srcdir}/pop.c ${srcdir}/../lib/min-max.h $(config_h)
         $(CC) -c ${CPP_CFLAGS} ${MOVE_FLAGS} ${srcdir}/pop.c
 
-emacsclient${EXEEXT}: ${srcdir}/emacsclient.c ../src/config.h
+emacsclient${EXEEXT}: ${srcdir}/emacsclient.c $(config_h)
         $(CC) ${ALL_CFLAGS} ${srcdir}/emacsclient.c \
            -DVERSION="\"${version}\"" \
            $(LOADLIBES) -o emacsclient
 
-hexl${EXEEXT}: ${srcdir}/hexl.c ../src/config.h
+hexl${EXEEXT}: ${srcdir}/hexl.c $(config_h)
         $(CC) ${ALL_CFLAGS} ${srcdir}/hexl.c $(LOADLIBES) -o hexl
 
-update-game-score${EXEEXT}: ${srcdir}/update-game-score.c ../src/config.h
+update-game-score${EXEEXT}: ${srcdir}/update-game-score.c $(config_h)
         $(CC) ${ALL_CFLAGS} -DHAVE_SHARED_GAME_DIR="\"$(gamedir)\"" \
           ${srcdir}/update-game-score.c $(LOADLIBES) -o update-game-score