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

diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index a9628ab18d..bb8852b6b2 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -15,7 +15,8 @@
 
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs; see the file COPYING.  If not, write to
-# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
 
 # Avoid trouble on systems where the `SHELL' variable might be
 # inherited from the environment.
@@ -82,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 ===========================
 
@@ -92,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
 
@@ -122,19 +125,11 @@ 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.  */
 
 #define NO_SHORTNAMES
-#define THIS_IS_YMAKEFILE
+#define THIS_IS_MAKEFILE
 #define NOT_C_CODE
 #include "../src/config.h"
 
@@ -144,12 +139,23 @@ MOVE_LIBS=
 #undef alloca
 #endif
 
-/* Some s/*.h files define this to request special libraries.  */
+/* Some machines don't find the standard C libraries in the usual place.  */
+#ifndef ORDINARY_LINK
+#ifndef LIB_STANDARD_LIBSRC
+#define LIB_STANDARD_LIBSRC -lc
+#endif
+#else
+#ifndef LIB_STANDARD_LIBSRC
+#define LIB_STANDARD_LIBSRC
+#endif
+#endif
+
+/* 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
@@ -175,19 +181,44 @@ MOVE_LIBS=
 #define BLESSMAIL
 #endif
 
-LOADLIBES=LIBS_SYSTEM LIBS_MACHINE
+#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.
    Some other files - those shared with other GNU utilities - need
    HAVE_CONFIG_H #defined before they know they can take advantage of
    the information in ../src/config.h.  */
-ALL_CFLAGS = C_SWITCH_SYSTEM C_SWITCH_MACHINE -Demacs -DHAVE_CONFIG_H \
+ALL_CFLAGS = C_SWITCH_SYSTEM C_SWITCH_MACHINE -DHAVE_CONFIG_H \
    -I. -I../src -I${srcdir} -I${srcdir}/../src ${LDFLAGS} ${CPPFLAGS} ${CFLAGS}
-LINK_CFLAGS = C_SWITCH_SYSTEM C_SWITCH_MACHINE -Demacs -DHAVE_CONFIG_H \
+LINK_CFLAGS = C_SWITCH_SYSTEM C_SWITCH_MACHINE -DHAVE_CONFIG_H \
    -I. -I../src -I${srcdir} -I${srcdir}/../src ${LDFLAGS} ${CFLAGS}
-CPP_CFLAGS = C_SWITCH_SYSTEM C_SWITCH_MACHINE -Demacs -DHAVE_CONFIG_H \
+CPP_CFLAGS = C_SWITCH_SYSTEM C_SWITCH_MACHINE -DHAVE_CONFIG_H \
    -I. -I../src -I${srcdir} -I${srcdir}/../src ${CPPFLAGS} ${CFLAGS}
-/* This is all of CPP_CFLAGS except -Demacs.  */
+/* This was all of CPP_CFLAGS except -Demacs.
+   Now that -Demacs has been deleted from CPP_CFLAGS,
+   this is actually the same as CPP_CFLAGS, but let's not delete it yet.  */
 BASE_CFLAGS = C_SWITCH_SYSTEM C_SWITCH_MACHINE -DHAVE_CONFIG_H \
    -I. -I../src -I${srcdir} -I${srcdir}/../src ${CPPFLAGS} ${CFLAGS}
 
@@ -202,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
 
@@ -227,26 +258,26 @@ ${archlibdir}: all
 	$(top_srcdir)/mkinstalldirs ${archlibdir}
 	if [ `(cd ${archlibdir} && /bin/pwd)` != `/bin/pwd` ]; then \
 	  for file in ${UTILITIES}; do \
-	    (cd ..; $(INSTALL_PROGRAM) lib-src/$$file ${archlibdir}/$$file) ; \
+	    $(INSTALL_PROGRAM) $(INSTALL_STRIP) $$file ${archlibdir}/$$file ; \
 	  done ; \
         fi
         if [ `(cd ${archlibdir} && /bin/pwd)` \
              != `(cd ${srcdir} && /bin/pwd)` ]; then \
 	  for file in ${SCRIPTS}; do \
-	    (cd ..; $(INSTALL_PROGRAM) ${srcdir}/$$file ${archlibdir}/$$file); \
+	    $(INSTALL_PROGRAM) ${srcdir}/$$file ${archlibdir}/$$file; \
 	  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."
 	for file in ${INSTALLABLES} ; do \
-	  (cd ..; $(INSTALL_PROGRAM) lib-src/$${file} ${bindir}/$${file}) ; \
+	  $(INSTALL_PROGRAM) $${file} ${bindir}/$${file} ; \
+	  chmod a+rx ${bindir}/$${file}; \
 	done
 	for file in ${INSTALLABLE_SCRIPTS} ; do \
-	  (cd ..; $(INSTALL_PROGRAM) ${srcdir}/$${file} ${bindir}/$${file}) ; \
+	  $(INSTALL_PROGRAM) ${srcdir}/$${file} ${bindir}/$${file} ; \
+	  chmod a+rx ${bindir}/$${file}; \
 	done
 
 uninstall:
@@ -264,7 +295,7 @@ clean: mostlyclean
 
 distclean: clean
 	-rm -f TAGS
-	-rm -f Makefile Makefile.in blessmail
+	-rm -f Makefile Makefile.c blessmail
 
 maintainer-clean: distclean
 	true
@@ -282,6 +313,7 @@ relock:
 check:
 	@echo "We don't have any tests for GNU Emacs yet."
 
+tags: TAGS
 TAGS: etags
 	etags *.[ch]
 
@@ -310,7 +342,7 @@ REGEXPOBJ = regex.o
 REGEXPDEPS = $(REGEXPOBJ) ../src/regex.h
 #endif
 
-regex.o: ../src/regex.c ../src/regex.h
+regex.o: ../src/regex.c ../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
@@ -318,11 +350,8 @@ etags: ${srcdir}/etags.c $(GETOPTDEPS) $(REGEXPDEPS) ../src/config.h
 
 /* 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) ${ALL_CFLAGS} -DCTAGS -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(LOADLIBES) -o ctags
-
-wakeup: ${srcdir}/wakeup.c
-	$(CC) ${ALL_CFLAGS} ${srcdir}/wakeup.c $(LOADLIBES) -o wakeup
+ctags: etags
+	$(CC) ${ALL_CFLAGS} -DCTAGS -DVERSION="\"${version}\"" -DETAGS_REGEXPS ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o ctags
 
 profile: ${srcdir}/profile.c
 	$(CC) ${ALL_CFLAGS} ${srcdir}/profile.c $(LOADLIBES) -o profile
@@ -339,11 +368,11 @@ 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} ${MOVE_FLAGS} ${srcdir}/movemail.c
+	$(CC) -c ${CPP_CFLAGS} -Demacs ${MOVE_FLAGS} ${srcdir}/movemail.c
 
 pop.o: ${srcdir}/pop.c
 	$(CC) -c ${CPP_CFLAGS} ${MOVE_FLAGS} ${srcdir}/pop.c
@@ -360,24 +389,16 @@ 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)
-getdate.o: ${srcdir}/getdate.y ../src/config.h
-	${YACC} ${YFLAGS} ${srcdir}/getdate.y
-	$(CC) $(CPP_CFLAGS) -c y.tab.c
-	mv y.tab.o getdate.o
-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.in.  */
+   See ../src/Makefile.in.  */
 emacstool: ${srcdir}/emacstool.c
 	$(CC) ${srcdir}/emacstool.c -o emacstool ${ALL_CFLAGS} \
 	  -lsuntool -lsunwindow -lpixrect $(LOADLIBES)