(shell-command-history): New variable.

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

diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 6c4b35bbfb55ab4f6016d5c5820f231cb474d9fd..2ea43a779899925d383b3ffeab0dd4b923148223 100644 (file)
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -19,6 +19,7 @@ CFLAGS=-g
 ALLOCA=
 C_SWITCH_SYSTEM=
 LOADLIBES=
+YACC=yacc
 version=version-not-set
 configname=configuration-name-not-set
 
@@ -104,11 +105,16 @@ SOURCES = COPYING ChangeLog Makefile.in README aixcc.lex emacs.csh \
 ### HAVE_CONFIG_H #defined before they know they can take advantage of
 ### the information in ../src/config.h.
 ALL_CFLAGS = ${C_SWITCH_SYSTEM} -Demacs -DHAVE_CONFIG_H \
-   -I${srcdir} -I${srcdir}/../src -I../src ${CFLAGS}
+   -I${srcdir} -I${srcdir}/../src -I. -I../src ${CFLAGS}
+CPP_CFLAGS = ${C_SWITCH_SYSTEM} -Demacs -DHAVE_CONFIG_H \
+   -I${srcdir} -I${srcdir}/../src -I. -I../src ${CPPFLAGS} ${CFLAGS}
+# 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 ${CPPFLAGS} ${ALL_CFLAGS} $<
+       ${CC} -c ${CPP_CFLAGS} $<
 
-all: ${EXECUTABLES}
+all: ${UTILITIES} ${INSTALLABLES}
 
 ### Install the internal utilities.  Until they are installed, we can
 ### just run them directly from lib-src.
@@ -116,7 +122,7 @@ ${archlibdir}: all
        @echo
        @echo "Installing utilities run internally by Emacs."
        ./make-path ${archlibdir}
-       if [ `(cd ${archlibdir};/bin/pwd)` != `/bin/pwd` ]; then \
+       if [ `(cd ${archlibdir} && /bin/pwd)` != `/bin/pwd` ]; then \
          for file in ${UTILITIES} ${INSTALLABLES}; do \
            cp $${file} ${archlibdir} ; \
            chmod 755 ${archlibdir}/$${file} ; \
@@ -125,7 +131,7 @@ ${archlibdir}: all
            cp $${file} ${archlibdir} ; \
            chmod 755 ${archlibdir}/$${file} ; \
          done ; \
-        fi
+       fi
        @echo
        @echo "Changing the owner and group of Emacs's utility programs to \`bin'."
        @echo "(You may ignore errors here if you don't care about this.)"
@@ -136,35 +142,42 @@ ${archlibdir}: all
 
 # We don't need to install `wakeup' explicitly, because it will be copied when
 # this whole directory is copied.
+# We use .n, not .new as before, to avoid exceeding the 14-character limit.
 install: ${archlibdir}
        @echo
        @echo "Installing utilities for users to run."
        for file in ${INSTALLABLES} ; do \
-         cp $${file} ${bindir}/$${file}.new ; \
-         chmod 755 ${bindir}/$${file}.new ; \
-        done
+         cp $${file} ${bindir}/$${file}.n ; \
+         chmod 755 ${bindir}/$${file}.n ; \
+       done
        for file in ${INSTALLABLE_SCRIPTS} ; do \
-         cp ${srcdir}/$${file} ${bindir}/$${file}.new ; \
-         chmod 755 ${bindir}/$${file}.new ; \
-        done
+         cp ${srcdir}/$${file} ${bindir}/$${file}.n ; \
+         chmod 755 ${bindir}/$${file}.n ; \
+       done
        @echo
        @echo "Changing the owner and group of utility programs to \`bin'."
        @echo "(You may ignore errors here if you don't care about this.)"
        -for file in ${INSTALLABLES}  ${INSTALLABLE_SCRIPTS} ; do \
-         chgrp bin ${bindir}/$${file}.new ; \
-         chown bin ${bindir}/$${file}.new ; \
+         chgrp bin ${bindir}/$${file}.n ; \
+         chown bin ${bindir}/$${file}.n ; \
          rm -f ${bindir}/$${file} ; \
-         mv ${bindir}/$${file}.new ${bindir}/$${file} ; \
-        done
+         mv ${bindir}/$${file}.n ${bindir}/$${file} ; \
+       done
+
+uninstall:
+       (cd ${bindir}; \
+        rm -f ${INSTALLABLES} ${INSTALLABLE_SCRIPTS})
+       (cd ${archlibdir}; \
+        rm -f ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS})
 
 clean mostlyclean:
        -rm -f ${INSTALLABLES} ${UTILITIES} core *.o
 
-distclean:
-       -rm -f ${INSTALLABLES} ${UTILITIES} ../etc/DOC* core *.o
+distclean: clean
+       -rm -f ../etc/DOC* *.tab.c *.tab.h aixcc.c TAGS
 
 realclean: distclean
-       -rm TAGS aixcc.c
+       true
 
 extraclean: realclean
        -rm -f *~ \#*
@@ -193,89 +206,93 @@ test-distrib: ${srcdir}/test-distrib.c
 GETOPTOBJS = getopt.o getopt1.o $(ALLOCA)
 GETOPTDEPS = $(GETOPTOBJS) ${srcdir}/getopt.h
 getopt.o: ${srcdir}/getopt.c ${srcdir}/getopt.h
+       ${CC} -c ${CPP_CFLAGS} ${srcdir}/getopt.c
 getopt1.o: ${srcdir}/getopt1.c ${srcdir}/getopt.h
+       ${CC} -c ${CPP_CFLAGS} ${srcdir}/getopt1.c
 
-etags: ${srcdir}/etags.c $(GETOPTDEPS)
-       $(CC) ${ALL_CFLAGS} -DETAGS ${srcdir}/etags.c $(GETOPTOBJS) $(LOADLIBES) -o etags
+etags: ${srcdir}/etags.c $(GETOPTDEPS) ../src/config.h
+       $(CC) ${CPP_CFLAGS} -DETAGS ${srcdir}/etags.c $(GETOPTOBJS) $(LOADLIBES) -o etags
 
-ctags: ${srcdir}/etags.c $(GETOPTDEPS)
-       $(CC) ${ALL_CFLAGS} -DCTAGS ${srcdir}/etags.c $(GETOPTOBJS) $(LOADLIBES) -o ctags
+# We depend on etags to assure that parallel makes don't write two
+# etags.o files on top of each other.
+ctags: ${srcdir}/etags.c $(GETOPTDEPS) etags
+       $(CC) ${CPP_CFLAGS} -DCTAGS ${srcdir}/etags.c $(GETOPTOBJS) $(LOADLIBES) -o ctags
 
 wakeup: ${srcdir}/wakeup.c
-       $(CC) ${ALL_CFLAGS} ${srcdir}/wakeup.c $(LOADLIBES) -o wakeup
+       $(CC) ${CPP_CFLAGS} ${srcdir}/wakeup.c $(LOADLIBES) -o wakeup
 
 make-docfile: ${srcdir}/make-docfile.c
-       $(CC) ${ALL_CFLAGS} ${srcdir}/make-docfile.c $(LOADLIBES) -o make-docfile
+       $(CC) ${CPP_CFLAGS} ${srcdir}/make-docfile.c $(LOADLIBES) -o make-docfile
 
 digest-doc: ${srcdir}/digest-doc.c
-       $(CC) ${ALL_CFLAGS} ${srcdir}/digest-doc.c $(LOADLIBES) -o digest-doc 
+       $(CC) ${CPP_CFLAGS} ${srcdir}/digest-doc.c $(LOADLIBES) -o digest-doc 
 
 sorted-doc: ${srcdir}/sorted-doc.c ${ALLOCA}
-       $(CC) ${ALL_CFLAGS} ${srcdir}/sorted-doc.c ${ALLOCA} $(LOADLIBES) -o sorted-doc
+       $(CC) ${CPP_CFLAGS} ${srcdir}/sorted-doc.c ${ALLOCA} $(LOADLIBES) -o sorted-doc
 
 b2m: ${srcdir}/b2m.c ../src/config.h
-       $(CC) -I${srcdir}/../src ${ALL_CFLAGS} ${srcdir}/b2m.c $(LOADLIBES) -o b2m 
+       $(CC) -I${srcdir}/../src ${CPP_CFLAGS} ${srcdir}/b2m.c $(LOADLIBES) -o b2m 
 
 movemail: ${srcdir}/movemail.c ../src/config.h
-       $(CC) -I${srcdir}/../src ${ALL_CFLAGS} ${srcdir}/movemail.c $(LOADLIBES) -o movemail
+       $(CC) -I${srcdir}/../src ${CPP_CFLAGS} ${srcdir}/movemail.c $(LOADLIBES) -o movemail
 
 cvtmail: ${srcdir}/cvtmail.c
-       $(CC) ${ALL_CFLAGS} ${srcdir}/cvtmail.c $(LOADLIBES) -o cvtmail
+       $(CC) ${CPP_CFLAGS} ${srcdir}/cvtmail.c $(LOADLIBES) -o cvtmail
 
 fakemail: ${srcdir}/fakemail.c ../src/config.h
-       $(CC) -I${srcdir}/../src ${ALL_CFLAGS} ${srcdir}/fakemail.c $(LOADLIBES) -o fakemail
+       $(CC) -I${srcdir}/../src ${CPP_CFLAGS} ${srcdir}/fakemail.c $(LOADLIBES) -o fakemail
 
 yow: ${srcdir}/yow.c ../src/paths.h
-       $(CC) ${ALL_CFLAGS} ${srcdir}/yow.c $(LOADLIBES) -o yow
+       $(CC) ${CPP_CFLAGS} ${srcdir}/yow.c $(LOADLIBES) -o yow
 
 env: ${srcdir}/env.c ../src/config.h
-       $(CC) -DEMACS -I${srcdir}/../src ${ALL_CFLAGS} ${srcdir}/env.c $(LOADLIBES) -o env
+       $(CC) -DEMACS -I${srcdir}/../src ${CPP_CFLAGS} ${srcdir}/env.c $(LOADLIBES) -o env
 
 emacsserver: ${srcdir}/emacsserver.c ../src/config.h
-       $(CC) -I${srcdir}/../src ${ALL_CFLAGS} ${srcdir}/emacsserver.c $(LOADLIBES) -o emacsserver
+       $(CC) -I${srcdir}/../src ${CPP_CFLAGS} ${srcdir}/emacsserver.c $(LOADLIBES) -o emacsserver
 
 emacsclient: ${srcdir}/emacsclient.c ../src/config.h
-       $(CC) -I${srcdir}/../src ${ALL_CFLAGS} ${srcdir}/emacsclient.c $(LOADLIBES) -o emacsclient
+       $(CC) -I${srcdir}/../src ${CPP_CFLAGS} ${srcdir}/emacsclient.c $(LOADLIBES) -o emacsclient
 
 hexl: ${srcdir}/hexl.c
-       $(CC) ${ALL_CFLAGS} ${srcdir}/hexl.c $(LOADLIBES) -o hexl
+       $(CC) ${CPP_CFLAGS} ${srcdir}/hexl.c $(LOADLIBES) -o hexl
 
 TIMEROBJS=getdate.o timer.o $(ALLOCA)
 getdate.o: ${srcdir}/getdate.y ../src/config.h
        ${YACC} ${YFLAGS} ${srcdir}/getdate.y
-       $(CC) -I${srcdir}/../src $(ALL_CFLAGS) -c y.tab.c
+       $(CC) -I${srcdir}/../src $(CPP_CFLAGS) -c y.tab.c
        mv y.tab.o getdate.o
 timer.o: ${srcdir}/timer.c ../src/config.h
-       $(CC) -c -I${srcdir}/../src $(ALL_CFLAGS) ${srcdir}/timer.c
+       $(CC) -c -I${srcdir}/../src $(CPP_CFLAGS) ${srcdir}/timer.c
 timer: ${TIMEROBJS}
-       $(CC) -I${srcdir}/../src $(ALL_CFLAGS) ${TIMEROBJS} -o timer
+       $(CC) -I${srcdir}/../src $(ALL_CFLAGS) ${TIMEROBJS} $(LOADLIBES) -o timer
 
 make-path: ${srcdir}/make-path.c
-       $(CC) $(ALL_CFLAGS) ${srcdir}/make-path.c -o make-path
+       $(CC) $(CPP_CFLAGS) ${srcdir}/make-path.c -o make-path
 
 # These are NOT included in INSTALLABLES or UTILITIES.
 # See ../src/ymakefile.
 emacstool: ${srcdir}/emacstool.c
-       $(CC) ${srcdir}/emacstool.c -o emacstool ${ALL_CFLAGS} \
+       $(CC) ${srcdir}/emacstool.c -o emacstool ${CPP_CFLAGS} \
          -lsuntool -lsunwindow -lpixrect $(LOADLIBES)
 
 # For SUN Japanese Language Environment
 nemacstool: ${srcdir}/emacstool.c
-       $(CC) -o nemacstool -DJLE ${ALL_CFLAGS} ${srcdir}/emacstool.c \
+       $(CC) -o nemacstool -DJLE ${CPP_CFLAGS} ${srcdir}/emacstool.c \
          -lsuntool -lmle -lsunwindow -lpixrect $(LOADLIBES)
 
 xvetool: ${srcdir}/emacstool.c
-       $(CC) -o xvetool -DXVIEW ${ALL_CFLAGS} ${srcdir}/emacstool.c \
+       $(CC) -o xvetool -DXVIEW ${CPP_CFLAGS} ${srcdir}/emacstool.c \
          -lxview -lX -I$(OPENWINHOME)/include -L$(OPENWINHOME)/lib \
          $(LOADLIBES)
 
 xveterm: ${srcdir}/emacstool.c
-       $(CC) -o xveterm -DXVIEW -DTTERM ${ALL_CFLAGS} ${srcdir}/emacstool.c \
+       $(CC) -o xveterm -DXVIEW -DTTERM ${CPP_CFLAGS} ${srcdir}/emacstool.c \
          -lxview -lolgx -lX  -I$(OPENWINHOME)/include -L$(OPENWINHOME)/lib \
          $(LOADLIBES)
 
 aixcc: ${srcdir}/aixcc.c
-       $(CC) $(ALL_CFLAGS) -o aixcc ${srcdir}/aixcc.c
+       $(CC) $(CPP_CFLAGS) -o aixcc ${srcdir}/aixcc.c
 
 aixcc.c: ${srcdir}/aixcc.lex
        lex ${srcdir}/aixcc.lex