(profile, make-docfile, hexl): Depend on config.h.

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

diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index bb8852b6b25346ccad63440f4fd5bf7fa57cff1d..44e8089c4f728afe53011552488d46413fdfd22b 100644 (file)
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -59,6 +59,8 @@ libexecdir=@libexecdir@
 # script's `--srcdir' option.  However, the value of ${srcdir} in
 # this makefile is not identical to what was specified with --srcdir,
 # since the variable here has `/lib-src' added at the end.
+
+# We use $(srcdir) explicitly in dependencies so as not to depend on VPATH.
 srcdir=@srcdir@
 VPATH=@srcdir@
 
@@ -90,8 +92,8 @@ INSTALL_STRIP =
 
 # Things that a user might actually run,
 # which should be installed in bindir.
-INSTALLABLES = etags ctags emacsclient b2m
-INSTALLABLE_SCRIPTS = rcs-checkin
+INSTALLABLES = etags ctags emacsclient b2m ebrowse
+INSTALLABLE_SCRIPTS = rcs-checkin grep-changelog
 
 # Things that Emacs runs internally, or during the build process,
 #  which should not be installed in bindir.
@@ -182,23 +184,35 @@ MOVE_FLAGS=
 #endif
 
 #ifdef KERBEROS
-#ifdef HAVE_LIBKRB
-  /* For krb5, use -lkrb5 */
-  KRBLIB=-lkrb
-#endif
-#ifdef HAVE_LIBDES
-  /* For krb4, use -lcrypto */
-  DESLIB=-ldes
-#endif
-#ifdef HAVE_LIBCOM_ERR
-  COM_ERRLIB=-lcom_err
-#endif
+# ifdef HAVE_LIBKRB
+    KRB4LIB = -lkrb
+# else
+#  ifdef HAVE_LIBKRB4
+     KRB4LIB = -lkrb4
+#  endif
+# endif
+# ifdef HAVE_LIBDES
+    DESLIB = -ldes
+# else
+#  ifdef HAVE_LIBDES425
+    DESLIB = -ldes425
+#  endif
+# endif
+# ifdef HAVE_LIBKRB5
+    KRB5LIB = -lkrb5
+# endif
+# ifdef HAVE_LIBCRYPTO
+    CRYPTOLIB = -lcrypto
+# endif
+# ifdef HAVE_LIBCOM_ERR
+    COM_ERRLIB = -lcom_err
+# endif
 #endif /* KERBEROS */
 
 /* If HESIOD is defined, set this to "-lhesiod". */
 HESIODLIB=
 
-MOVE_LIBS=$(KRBLIB) $(DESLIB) $(COM_ERRLIB) $(HESIODLIB)
+MOVE_LIBS=$(KRB4LIB) $(DESLIB) $(KRB5LIB) $(CRYPTOLIB) $(COM_ERRLIB) $(HESIODLIB)
 
 #ifdef HAVE_LIBMAIL
 LIBMAIL=-lmail
@@ -233,7 +247,7 @@ all: ${DONT_INSTALL} ${UTILITIES} ${INSTALLABLES}
 
 #ifdef MOVEMAIL_NEEDS_BLESSING
 blessmail:
-       ../src/emacs -batch -l $(srcdir)/../lisp/blessmail.el
+       ../src/emacs -batch -l $(srcdir)/../lisp/mail/blessmail.el
        chmod +x blessmail
 #endif
 
@@ -272,7 +286,7 @@ install: ${archlibdir}
        @echo
        @echo "Installing utilities for users to run."
        for file in ${INSTALLABLES} ; do \
-         $(INSTALL_PROGRAM) $${file} ${bindir}/$${file} ; \
+         $(INSTALL_PROGRAM) $(INSTALL_STRIP) $${file} ${bindir}/$${file} ; \
          chmod a+rx ${bindir}/$${file}; \
        done
        for file in ${INSTALLABLE_SCRIPTS} ; do \
@@ -291,7 +305,7 @@ mostlyclean:
 
 clean: mostlyclean
        -rm -f ${INSTALLABLES} ${UTILITIES} ${DONT_INSTALL}
-       -rm -f ../etc/DOC* *.tab.c *.tab.h
+       -rm -f ../etc/DOC* fns*.el *.tab.c *.tab.h
 
 distclean: clean
        -rm -f TAGS
@@ -332,31 +346,34 @@ getopt.o: ${srcdir}/getopt.c ${srcdir}/getopt.h
 getopt1.o: ${srcdir}/getopt1.c ${srcdir}/getopt.h
        ${CC} -c ${CPP_CFLAGS} ${srcdir}/getopt1.c
 alloca.o: ${srcdir}/alloca.c
-       ${CC} -c ${BASE_CFLAGS} ${srcdir}/alloca.c
+       ${CC} -Demacs -c ${BASE_CFLAGS} ${srcdir}/alloca.c
 
 #ifdef REGEXP_IN_LIBC
 REGEXPOBJ =
 REGEXPDEPS =
 #else
 REGEXPOBJ = regex.o
-REGEXPDEPS = $(REGEXPOBJ) ../src/regex.h
+REGEXPDEPS = $(REGEXPOBJ) $(srcdir)/../src/regex.h
 #endif
 
-regex.o: ../src/regex.c ../src/regex.h ../src/config.h
+regex.o: $(srcdir)/../src/regex.c $(srcdir)/../src/regex.h ../src/config.h
        ${CC} -c ${BASE_CFLAGS} -DCONFIG_BROKETS -DINHIBIT_STRING_HEADER ${srcdir}/../src/regex.c
 
 etags: ${srcdir}/etags.c $(GETOPTDEPS) $(REGEXPDEPS) ../src/config.h
-       $(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" -DETAGS_REGEXPS ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o etags
+       $(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o etags
+
+ebrowse: ${srcdir}/ebrowse.c $(GETOPTDEPS) ../src/config.h
+       $(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" ${srcdir}/ebrowse.c $(GETOPTOBJS) $(LOADLIBES) -o ebrowse
 
 /* We depend on etags to assure that parallel makes don't write two
    etags.o files on top of each other.  */
 ctags: etags
-       $(CC) ${ALL_CFLAGS} -DCTAGS -DVERSION="\"${version}\"" -DETAGS_REGEXPS ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o ctags
+       $(CC) ${ALL_CFLAGS} -DCTAGS -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o ctags
 
-profile: ${srcdir}/profile.c
+profile: ${srcdir}/profile.c ../src/config.h
        $(CC) ${ALL_CFLAGS} ${srcdir}/profile.c $(LOADLIBES) -o profile
 
-make-docfile: ${srcdir}/make-docfile.c
+make-docfile: ${srcdir}/make-docfile.c ../src/config.h
        $(CC) ${ALL_CFLAGS} ${srcdir}/make-docfile.c $(LOADLIBES) -o make-docfile
 
 digest-doc: ${srcdir}/digest-doc.c
@@ -365,8 +382,9 @@ digest-doc: ${srcdir}/digest-doc.c
 sorted-doc: ${srcdir}/sorted-doc.c ${ALLOCA}
        $(CC) ${ALL_CFLAGS} ${srcdir}/sorted-doc.c ${ALLOCA} $(LOADLIBES) -o sorted-doc
 
-b2m: ${srcdir}/b2m.c ../src/config.h
-       $(CC) ${ALL_CFLAGS} ${srcdir}/b2m.c $(LOADLIBES) -o b2m 
+b2m: ${srcdir}/b2m.c ../src/config.h $(GETOPTDEPS)
+       $(CC) ${ALL_CFLAGS} ${srcdir}/b2m.c  -DVERSION="\"${version}\"" \
+          $(GETOPTOBJS) $(LOADLIBES) -o b2m 
 
 movemail: movemail.o pop.o $(GETOPTDEPS)
        $(CC) ${LINK_CFLAGS} ${MOVE_FLAGS} movemail.o pop.o $(GETOPTOBJS) $(LOADLIBES) $(LIBMAIL) $(MOVE_LIBS) -o movemail
@@ -374,7 +392,7 @@ movemail: movemail.o pop.o $(GETOPTDEPS)
 movemail.o: ${srcdir}/movemail.c ../src/config.h
        $(CC) -c ${CPP_CFLAGS} -Demacs ${MOVE_FLAGS} ${srcdir}/movemail.c
 
-pop.o: ${srcdir}/pop.c
+pop.o: ${srcdir}/pop.c  ../src/config.h
        $(CC) -c ${CPP_CFLAGS} ${MOVE_FLAGS} ${srcdir}/pop.c
 
 cvtmail: ${srcdir}/cvtmail.c
@@ -383,7 +401,7 @@ cvtmail: ${srcdir}/cvtmail.c
 fakemail: ${srcdir}/fakemail.c ../src/config.h
        $(CC) ${ALL_CFLAGS} ${srcdir}/fakemail.c $(LOADLIBES) -o fakemail
 
-yow: ${srcdir}/yow.c ../src/paths.h
+yow: ${srcdir}/yow.c ../src/epaths.h
        $(CC) ${ALL_CFLAGS} ${srcdir}/yow.c $(LOADLIBES) -o yow
 
 emacsserver: ${srcdir}/emacsserver.c ../src/config.h
@@ -394,7 +412,7 @@ emacsclient: ${srcdir}/emacsclient.c ../src/config.h $(GETOPTDEPS)
           -DVERSION=`sed -n -e '/(defconst emacs-version/ s/^[^"]*\("[^"]*"\).*/\1/p' ${srcdir}/../lisp/version.el` \
           $(LOADLIBES) -o emacsclient
 
-hexl: ${srcdir}/hexl.c
+hexl: ${srcdir}/hexl.c ../src/config.h
        $(CC) ${ALL_CFLAGS} ${srcdir}/hexl.c $(LOADLIBES) -o hexl
 
 /* These are NOT included in INSTALLABLES or UTILITIES.