Merge from trunk.

[gnu-emacs] / lib-src / Makefile.in

diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 5c9a62a2c56470ffe5d712679fa35ff5959351e8..c5e117f66f9cfa67310d388b1e5f7f9862efc3e5 100644 (file)
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -175,36 +175,30 @@ 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
 
-## This is the default compilation command.
-## But we should never rely on it, because some make version failed to
-## find it for getopt.o.
-## Using an explicit command made it work.
-.c.o:
-       ${CC} -c ${CPP_CFLAGS} $<
-
-all: ${DONT_INSTALL} ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS}  ${STAMP_INST_SCRIPTS} ${STAMP_SCRIPTS}
-
 ## These targets copy the scripts into the build directory so that
 ## they can be run from there in an uninstalled Emacs.
-## The "-" is prepended because some versions of cp barf when srcdir
-## is the current directory, and thus the file will be copied into itself.
+## Nothing to do if pwd = srcdir.
+insrcdir=[ "`/bin/pwd`" = "`(cd $(srcdir) && /bin/pwd)`" ]
+
 stamp-rcs2log: $(srcdir)/rcs2log
-       -cp -p $(srcdir)/rcs2log rcs2log
+       $(insrcdir) || cp -p $(srcdir)/rcs2log rcs2log
        touch $@
 
 stamp-rcs-checkin: $(srcdir)/rcs-checkin
-       -cp -p $(srcdir)/rcs-checkin rcs-checkin
+       $(insrcdir) || cp -p $(srcdir)/rcs-checkin rcs-checkin
        touch $@
 
 stamp-grep-changelog: $(srcdir)/grep-changelog
-       -cp -p $(srcdir)/grep-changelog grep-changelog
+       $(insrcdir) || cp -p $(srcdir)/grep-changelog grep-changelog
        touch $@
 
 stamp-vcdiff: $(srcdir)/vcdiff
-       -cp -p $(srcdir)/vcdiff vcdiff
+       $(insrcdir) || cp -p $(srcdir)/vcdiff vcdiff
        touch $@
 
 ## Only used if we need blessmail, but no harm in always defining.
@@ -235,13 +229,13 @@ maybe-blessmail: $(BLESSMAIL_TARGET)
 $(DESTDIR)${archlibdir}: all
        @echo
        @echo "Installing utilities run internally by Emacs."
-       umask 022; $(top_srcdir)/install-sh -d $(DESTDIR)${archlibdir}
+       umask 022; $(top_srcdir)/build-aux/install-sh -d $(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)/install-sh -d $(DESTDIR)${gamedir}; \
+       umask 022; $(top_srcdir)/build-aux/install-sh -d $(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 \
@@ -281,8 +275,8 @@ mostlyclean:
        -rm -f core *.o
 
 clean: mostlyclean
-       -rm -f ${INSTALLABLES} ${UTILITIES} ${DONT_INSTALL}
-       -rm -f fns*.el *.tab.c *.tab.h stamp-*
+       -rm -f ${EXE_FILES}
+       -rm -f ${STAMP_INST_SCRIPTS} ${STAMP_SCRIPTS}
 
 distclean: clean
        -rm -f TAGS
@@ -340,13 +334,10 @@ make-docfile${EXEEXT}: ${srcdir}/make-docfile.c ../src/config.h
        $(CC) ${ALL_CFLAGS} ${srcdir}/make-docfile.c $(LOADLIBES) \
          -o make-docfile
 
-movemail${EXEEXT}: movemail.o pop.o
-       $(CC) ${LINK_CFLAGS} ${MOVE_FLAGS} movemail.o pop.o \
+movemail${EXEEXT}: ${srcdir}/movemail.c pop.o ../src/config.h
+       $(CC) ${ALL_CFLAGS} ${MOVE_FLAGS} ${srcdir}/movemail.c pop.o \
          $(LOADLIBES) $(LIBS_MOVE) -o movemail
 
-movemail.o: ${srcdir}/movemail.c ../src/config.h
-       $(CC) -c ${CPP_CFLAGS} ${MOVE_FLAGS} ${srcdir}/movemail.c
-
 pop.o: ${srcdir}/pop.c ${srcdir}/../lib/min-max.h ../src/config.h
        $(CC) -c ${CPP_CFLAGS} ${MOVE_FLAGS} ${srcdir}/pop.c