(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 a357975..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@
 
@@ -83,13 +85,15 @@ archlibdir=@archlibdir@
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
+# By default, we uphold the dignity of our programs.
+INSTALL_STRIP =
 
 # ========================== Lists of Files ===========================
 
 # 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.
@@ -179,17 +183,39 @@ MOVE_FLAGS=
 #define BLESSMAIL
 #endif
 
-#if defined (KERBEROS) && defined (HAVE_LIBKRB) && defined (HAVE_LIBDES)
-MOVE_LIBS= -lkrb -ldes -lcom_err
-/* For KERBEROS + KRB5
-    MOVE_LIBS= -lkrb5 -lcrypto -lisode -lcom_err
-    Add "-lhesiod" if HESIOD is defined.  */
-#else
-#if defined (KERBEROS) && defined (HAVE_LIBKRB)
-MOVE_LIBS= -lkrb -lcom_err
-#else
-MOVE_LIBS=
-#endif
+#ifdef KERBEROS
+# 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=$(KRB4LIB) $(DESLIB) $(KRB5LIB) $(CRYPTOLIB) $(COM_ERRLIB) $(HESIODLIB)
+
+#ifdef HAVE_LIBMAIL
+LIBMAIL=-lmail
 #endif
 
 LOADLIBES=LIBS_SYSTEM LIBS_MACHINE LIB_STANDARD_LIBSRC
@@ -221,7 +247,7 @@ all: ${DONT_INSTALL} ${UTILITIES} ${INSTALLABLES}
 
 #ifdef MOVEMAIL_NEEDS_BLESSING
 blessmail:
-       ../src/emacs -batch -l ../lisp/blessmail.el
+       ../src/emacs -batch -l $(srcdir)/../lisp/mail/blessmail.el
        chmod +x blessmail
 #endif
 
@@ -246,7 +272,7 @@ ${archlibdir}: all
        $(top_srcdir)/mkinstalldirs ${archlibdir}
        if [ `(cd ${archlibdir} && /bin/pwd)` != `/bin/pwd` ]; then \
          for file in ${UTILITIES}; do \
-           $(INSTALL_PROGRAM) $$file ${archlibdir}/$$file ; \
+           $(INSTALL_PROGRAM) $(INSTALL_STRIP) $$file ${archlibdir}/$$file ; \
          done ; \
         fi
         if [ `(cd ${archlibdir} && /bin/pwd)` \
@@ -260,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 \
@@ -279,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
@@ -327,19 +353,19 @@ 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
 
 /* 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
        $(CC) ${ALL_CFLAGS} ${srcdir}/profile.c $(LOADLIBES) -o profile
@@ -353,16 +379,17 @@ 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
-       $(CC) ${LINK_CFLAGS} ${MOVE_FLAGS} movemail.o pop.o $(LOADLIBES) $(MOVE_LIBS) -o movemail
+movemail: movemail.o pop.o $(GETOPTDEPS)
+       $(CC) ${LINK_CFLAGS} ${MOVE_FLAGS} movemail.o pop.o $(GETOPTOBJS) $(LOADLIBES) $(LIBMAIL) $(MOVE_LIBS) -o movemail
 
 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
@@ -371,14 +398,16 @@ 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
        $(CC) ${ALL_CFLAGS} ${srcdir}/emacsserver.c $(LOADLIBES) -o emacsserver
 
-emacsclient: ${srcdir}/emacsclient.c ../src/config.h
-       $(CC) ${ALL_CFLAGS} ${srcdir}/emacsclient.c $(LOADLIBES) -o emacsclient
+emacsclient: ${srcdir}/emacsclient.c ../src/config.h $(GETOPTDEPS)
+       $(CC) ${ALL_CFLAGS} ${srcdir}/emacsclient.c $(GETOPTOBJS)  \
+          -DVERSION=`sed -n -e '/(defconst emacs-version/ s/^[^"]*\("[^"]*"\).*/\1/p' ${srcdir}/../lisp/version.el` \
+          $(LOADLIBES) -o emacsclient
 
 hexl: ${srcdir}/hexl.c
        $(CC) ${ALL_CFLAGS} ${srcdir}/hexl.c $(LOADLIBES) -o hexl