X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/3b7ad313e0d7b351c55cf999474b61cdc18ecad1..0118dcd34323b01bb6472298df0741030eceb8a4:/lib-src/Makefile.in

diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 27bd6f2e64..bb8852b6b2 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -83,6 +83,8 @@ 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 ===========================
 
@@ -93,8 +95,8 @@ INSTALLABLE_SCRIPTS = rcs-checkin
 
 # Things that Emacs runs internally, or during the build process,
 #  which should not be installed in bindir.
-UTILITIES= wakeup profile digest-doc \
-	sorted-doc movemail cvtmail fakemail yow emacsserver hexl timer
+UTILITIES=  profile digest-doc \
+	sorted-doc movemail cvtmail fakemail yow emacsserver hexl
 
 DONT_INSTALL= test-distrib make-docfile
 
@@ -123,14 +125,6 @@ SOURCES = COPYING ChangeLog Makefile.in README emacs.csh \
 #			mail host for the site.
 MOVE_FLAGS=
 
-# Additional libraries for movemail:
-# For KERBEROS
-# MOVE_LIBS= -lkrb -ldes -lcom_err
-# For KERBEROS + KRB5
-# MOVE_LIBS= -lkrb5 -lcrypto -lisode -lcom_err
-# Add "-lhesiod" if HESIOD is defined.
-MOVE_LIBS=
-
 # ========================== start of cpp stuff =======================
 /* From here on, comments must be done in C syntax.  */
 
@@ -156,12 +150,12 @@ MOVE_LIBS=
 #endif
 #endif
 
-/* Some s/*.h files define this to request special libraries.  */
+/* Some s/SYSTEM.h files define this to request special libraries.  */
 #ifndef LIBS_SYSTEM
 #define LIBS_SYSTEM
 #endif
 
-/* Some m/*.h files define this to request special libraries.  */
+/* Some m/MACHINE.h files define this to request special libraries.  */
 #ifndef LIBS_MACHINE
 #define LIBS_MACHINE
 #endif
@@ -187,6 +181,29 @@ MOVE_LIBS=
 #define BLESSMAIL
 #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
+#endif /* KERBEROS */
+
+/* If HESIOD is defined, set this to "-lhesiod". */
+HESIODLIB=
+
+MOVE_LIBS=$(KRBLIB) $(DESLIB) $(COM_ERRLIB) $(HESIODLIB)
+
+#ifdef HAVE_LIBMAIL
+LIBMAIL=-lmail
+#endif
+
 LOADLIBES=LIBS_SYSTEM LIBS_MACHINE LIB_STANDARD_LIBSRC
 
 /* We need to #define emacs to get the right versions of some files.
@@ -216,7 +233,7 @@ all: ${DONT_INSTALL} ${UTILITIES} ${INSTALLABLES}
 
 #ifdef MOVEMAIL_NEEDS_BLESSING
 blessmail:
-	../src/emacs -batch -l ../lisp/blessmail.el
+	../src/emacs -batch -l $(srcdir)/../lisp/blessmail.el
 	chmod +x blessmail
 #endif
 
@@ -241,7 +258,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)` \
@@ -251,8 +268,6 @@ ${archlibdir}: all
 	  done ; \
 	fi
 
-/* We don't need to install `wakeup' explicitly, because it will be
-   copied when this whole directory is copied.  */
 install: ${archlibdir}
 	@echo
 	@echo "Installing utilities for users to run."
@@ -338,9 +353,6 @@ etags: ${srcdir}/etags.c $(GETOPTDEPS) $(REGEXPDEPS) ../src/config.h
 ctags: etags
 	$(CC) ${ALL_CFLAGS} -DCTAGS -DVERSION="\"${version}\"" -DETAGS_REGEXPS ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o ctags
 
-wakeup: ${srcdir}/wakeup.c
-	$(CC) ${ALL_CFLAGS} ${srcdir}/wakeup.c $(LOADLIBES) -o wakeup
-
 profile: ${srcdir}/profile.c
 	$(CC) ${ALL_CFLAGS} ${srcdir}/profile.c $(LOADLIBES) -o profile
 
@@ -356,8 +368,8 @@ sorted-doc: ${srcdir}/sorted-doc.c ${ALLOCA}
 b2m: ${srcdir}/b2m.c ../src/config.h
 	$(CC) ${ALL_CFLAGS} ${srcdir}/b2m.c $(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
@@ -377,24 +389,14 @@ yow: ${srcdir}/yow.c ../src/paths.h
 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
 
-TIMEROBJS=getdate.o timer.o $(ALLOCA)
-$(srcdir)/getdate.c: ${srcdir}/getdate.y
-	cd $(srcdir); ${YACC} ${YFLAGS} getdate.y
-	cd $(srcdir); mv y.tab.c getdate.c
-getdate.o: ${srcdir}/getdate.c ../src/config.h
-	$(CC) $(CPP_CFLAGS) -Demacs -c ${srcdir}/getdate.c
-
-timer.o: ${srcdir}/timer.c ../src/config.h
-	$(CC) -c $(CPP_CFLAGS) ${srcdir}/timer.c
-timer: ${TIMEROBJS}
-	$(CC) $(LINK_CFLAGS) ${TIMEROBJS} $(LOADLIBES) -o timer
-
 /* These are NOT included in INSTALLABLES or UTILITIES.
    See ../src/Makefile.in.  */
 emacstool: ${srcdir}/emacstool.c