(ETAGSOBJ): Remove reference to obsolete alloca.obj.

[bpt/emacs.git] / lib-src / Makefile.in

diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 24730fb..99db78a 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@
 
@@ -91,7 +93,7 @@ INSTALL_STRIP =
 # Things that a user might actually run,
 # which should be installed in bindir.
 INSTALLABLES = etags ctags emacsclient b2m
-INSTALLABLE_SCRIPTS = rcs-checkin
+INSTALLABLE_SCRIPTS = rcs-checkin grep-changelog
 
 # Things that Emacs runs internally, or during the build process,
 #  which should not be installed in bindir.
@@ -183,29 +185,29 @@ MOVE_FLAGS=
 
 #ifdef KERBEROS
 # ifdef HAVE_LIBKRB
-       KRB4LIB = -lkrb
+    KRB4LIB = -lkrb
 # else
 #  ifdef HAVE_LIBKRB4
-       KRB4LIB = -lkrb4
+     KRB4LIB = -lkrb4
 #  endif
 # endif
 # ifdef HAVE_LIBDES
-       DESLIB = -ldes
+    DESLIB = -ldes
 # else
 #  ifdef HAVE_LIBDES425
-       DESLIB = -ldes425
+    DESLIB = -ldes425
 #  endif
 # endif
 # ifdef HAVE_LIBKRB5
-       KRB5LIB = -lkrb5
+    KRB5LIB = -lkrb5
 # endif
 # ifdef HAVE_LIBCRYPTO
-       CRYPTOLIB = -lcrypto
+    CRYPTOLIB = -lcrypto
 # endif
 # ifdef HAVE_LIBCOM_ERR
-       COM_ERRLIB = -lcom_err
+    COM_ERRLIB = -lcom_err
 # endif
-#endif /* KERBEROS
+#endif /* KERBEROS */
 
 /* If HESIOD is defined, set this to "-lhesiod". */
 HESIODLIB=
@@ -303,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
@@ -351,10 +353,10 @@ 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
@@ -377,7 +379,7 @@ 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
+b2m: ${srcdir}/b2m.c ../src/config.h $(GETOPTDEPS)
        $(CC) ${ALL_CFLAGS} ${srcdir}/b2m.c  -DVERSION="\"${version}\"" \
           $(GETOPTOBJS) $(LOADLIBES) -o b2m 
 
@@ -387,7 +389,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
@@ -396,7 +398,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