X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/14beddf4711854b01d400f36166dc71eb39435bb..acaf905b1130aae80fa59d2c861ffd4c8eb75486:/lib-src/Makefile.in diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index 9697561310..cc1757e4e3 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. @@ -117,8 +117,8 @@ STAMP_INST_SCRIPTS = stamp-rcs-checkin stamp-grep-changelog # Things that Emacs runs internally, or during the build process, # which should not be installed in bindir. -UTILITIES = profile${EXEEXT} movemail${EXEEXT} fakemail${EXEEXT} \ - hexl${EXEEXT} update-game-score${EXEEXT} +UTILITIES = profile${EXEEXT} movemail${EXEEXT} hexl${EXEEXT} \ + update-game-score${EXEEXT} DONT_INSTALL= test-distrib${EXEEXT} make-docfile${EXEEXT} @@ -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)/mkinstalldirs $(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)/mkinstalldirs $(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 @@ -313,19 +307,16 @@ test-distrib${EXEEXT}: ${srcdir}/test-distrib.c ../lib/libgnu.a: ../src/config.h cd ../lib && $(MAKE) libgnu.a -REGEXPOBJ = regex.o -REGEXPDEPS = $(REGEXPOBJ) $(srcdir)/../src/regex.h - regex.o: $(srcdir)/../src/regex.c $(srcdir)/../src/regex.h ../src/config.h ${CC} -c ${CPP_CFLAGS} -DCONFIG_BROKETS -DINHIBIT_STRING_HEADER \ ${srcdir}/../src/regex.c -etags${EXEEXT}: ${srcdir}/etags.c $(REGEXPDEPS) ../src/config.h +etags${EXEEXT}: ${srcdir}/etags.c regex.o ../src/config.h $(CC) ${ALL_CFLAGS} -DEMACS_NAME="\"GNU Emacs\"" \ -DVERSION="\"${version}\"" ${srcdir}/etags.c \ - $(REGEXPOBJ) $(LOADLIBES) -o etags + regex.o $(LOADLIBES) -o etags -ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ../src/config.h +ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${srcdir}/../lib/min-max.h ../src/config.h $(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" \ ${srcdir}/ebrowse.c $(LOADLIBES) -o ebrowse @@ -334,7 +325,7 @@ ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ../src/config.h ctags${EXEEXT}: etags${EXEEXT} $(CC) ${ALL_CFLAGS} -DCTAGS -DEMACS_NAME="\"GNU Emacs\"" \ -DVERSION="\"${version}\"" ${srcdir}/etags.c \ - $(REGEXPOBJ) $(LOADLIBES) -o ctags + regex.o $(LOADLIBES) -o ctags profile${EXEEXT}: ${srcdir}/profile.c ../src/config.h $(CC) ${ALL_CFLAGS} ${srcdir}/profile.c $(LOADLIBES) -o profile @@ -343,19 +334,13 @@ 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 ../src/config.h +pop.o: ${srcdir}/pop.c ${srcdir}/../lib/min-max.h ../src/config.h $(CC) -c ${CPP_CFLAGS} ${MOVE_FLAGS} ${srcdir}/pop.c -fakemail${EXEEXT}: ${srcdir}/fakemail.c ../src/config.h - $(CC) ${ALL_CFLAGS} ${srcdir}/fakemail.c $(LOADLIBES) -o fakemail - emacsclient${EXEEXT}: ${srcdir}/emacsclient.c ../src/config.h $(CC) ${ALL_CFLAGS} ${srcdir}/emacsclient.c \ -DVERSION="\"${version}\"" \ @@ -364,12 +349,8 @@ emacsclient${EXEEXT}: ${srcdir}/emacsclient.c ../src/config.h hexl${EXEEXT}: ${srcdir}/hexl.c ../src/config.h $(CC) ${ALL_CFLAGS} ${srcdir}/hexl.c $(LOADLIBES) -o hexl -update-game-score${EXEEXT}: update-game-score.o - $(CC) ${LINK_CFLAGS} update-game-score.o \ - $(LOADLIBES) -o update-game-score - -update-game-score.o: ${srcdir}/update-game-score.c ../src/config.h - $(CC) -c ${CPP_CFLAGS} ${srcdir}/update-game-score.c \ - -DHAVE_SHARED_GAME_DIR="\"$(gamedir)\"" +update-game-score${EXEEXT}: ${srcdir}/update-game-score.c ../src/config.h + $(CC) ${ALL_CFLAGS} -DHAVE_SHARED_GAME_DIR="\"$(gamedir)\"" \ + ${srcdir}/update-game-score.c $(LOADLIBES) -o update-game-score ## Makefile ends here.