X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/96e19e26f503ae45f4dc0223407e48006c47b284..d2251bbf79c3a3c7739f0813ac85c0f99d295d6d:/lib-src/Makefile.in

diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 5657de7f40..44e8089c4f 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -1,12 +1,22 @@
-# DIST: This is the distribution Makefile for Emacs.  configure can
-# DIST: make most of the changes to this file you might want, so try
-# DIST: that first.
+# Makefile for lib-src subdirectory in GNU Emacs.
+# Copyright (C) 1985, 1987, 1988, 1993, 1994 Free Software Foundation, Inc.
 
-# add -DUSG for SysV movemail and timer
-# For Xenix, add the following for movemail:
-#  LOADLIBES= -lx
-# For Mips, the following is needed for who knows what.
-#  LOADLIBES = -lmld /usr/bsd43/usr/lib/libc.a
+# This file is part of GNU Emacs.
+
+# GNU Emacs is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# GNU Emacs is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# 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, 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.
@@ -17,11 +27,9 @@ SHELL = /bin/sh
 CC=@CC@
 CFLAGS=@CFLAGS@
 ALLOCA=@ALLOCA@
-C_SWITCH_SYSTEM=@c_switch_system@
-LOADLIBES=@libsrc_libs@
 YACC=@YACC@
 version=@version@
-configname=@configuration@
+configuration=@configuration@
 
 # ==================== Where To Install Things ====================
 
@@ -44,16 +52,21 @@ bindir=@bindir@
 # Where to install and expect executable files to be run by Emacs
 # rather than directly by users, and other architecture-dependent
 # data.  ${archlibdir} is usually below this.  This is set with the
-# --libdir option to `../configure'.
-libdir=@libdir@
+# --libexecdir option to `../configure'.
+libexecdir=@libexecdir@
 
 # Where to find the source code.  This is set by the configure
 # 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@
 
+# The top-level source directory, also set by configure.
+top_srcdir=@top_srcdir@
+
 # ==================== Emacs-specific directories ====================
 
 # These variables hold the values Emacs will actually use.  They are
@@ -66,90 +79,219 @@ VPATH=@srcdir@
 # to `../configure'.
 archlibdir=@archlibdir@
 
-# ==================== Utility Programs for the Build ====================
+# ==================== Utility Programs for the Build =================
 
 # ../configure figures out the correct values for these.
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
+# By default, we uphold the dignity of our programs.
+INSTALL_STRIP =
 
-# ============================= Targets ==============================
+# ========================== 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
+# Things that a user might actually run,
+# which should be installed in bindir.
+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.
-UTILITIES= test-distrib make-path wakeup make-docfile digest-doc sorted-doc \
-	movemail cvtmail fakemail yow env emacsserver hexl timer
+#  which should not be installed in bindir.
+UTILITIES=  profile digest-doc \
+	sorted-doc movemail cvtmail fakemail yow emacsserver hexl
+
+DONT_INSTALL= test-distrib make-docfile
 
 # Like UTILITIES, but they're not system-dependent, and should not be
-# deleted by the distclean target.
+#  deleted by the distclean target.
 SCRIPTS= rcs2log vcdiff
 
 EXECUTABLES= ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS}
 
-SOURCES = COPYING ChangeLog Makefile.in README aixcc.lex emacs.csh \
+SOURCES = COPYING ChangeLog Makefile.in README emacs.csh \
 	makedoc.com *.[chy] rcs2log vcdiff
 
-### 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} -Demacs -DHAVE_CONFIG_H \
-   -I. -I../src -I${srcdir} -I${srcdir}/../src ${CFLAGS}
-CPP_CFLAGS = ${C_SWITCH_SYSTEM} -Demacs -DHAVE_CONFIG_H \
+# Additional -D flags for movemail (add to MOVE_FLAGS if desired):
+# MAIL_USE_POP		Support mail retrieval from a POP mailbox.
+# MAIL_USE_MMDF		Support MMDF mailboxes.
+# MAIL_USE_FLOCK	Use flock for file locking (see the comments
+#			about locking in movemail.c)
+# MAIL_UNLINK_SPOOL	Unlink the user's spool mailbox after reading
+#			it (instead of just emptying it).
+# KERBEROS		Support Kerberized POP.
+# KRB5			Support Kerberos Version 5 pop instead of
+#			Version 4 (define this in addition to
+#			KERBEROS).
+# HESIOD		Support Hesiod lookups of user mailboxes.
+# MAILHOST		A string, the host name of the default POP
+#			mail host for the site.
+MOVE_FLAGS=
+
+# ========================== start of cpp stuff =======================
+/* From here on, comments must be done in C syntax.  */
+
+#define NO_SHORTNAMES
+#define THIS_IS_MAKEFILE
+#define NOT_C_CODE
+#include "../src/config.h"
+
+/* We won't really call alloca;
+   don't let the file name alloca.c get messed up.  */
+#ifdef alloca
+#undef alloca
+#endif
+
+/* 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/MACHINE.h files define this to request special libraries.  */
+#ifndef LIBS_MACHINE
+#define LIBS_MACHINE
+#endif
+
+#ifndef C_SWITCH_SYSTEM
+#define C_SWITCH_SYSTEM
+#endif
+
+#ifndef C_SWITCH_MACHINE
+#define C_SWITCH_MACHINE
+#endif
+
+#undef MOVEMAIL_NEEDS_BLESSING
+#ifndef MAIL_USE_FLOCK
+#ifndef MAIL_USE_LOCKF
+#define MOVEMAIL_NEEDS_BLESSING
+#endif
+#endif
+
+#ifdef MOVEMAIL_NEEDS_BLESSING
+#define BLESSMAIL blessmail
+#else
+#define BLESSMAIL
+#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
+
+/* 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 -DHAVE_CONFIG_H \
+   -I. -I../src -I${srcdir} -I${srcdir}/../src ${LDFLAGS} ${CPPFLAGS} ${CFLAGS}
+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 -DHAVE_CONFIG_H \
    -I. -I../src -I${srcdir} -I${srcdir}/../src ${CPPFLAGS} ${CFLAGS}
-# This is the default compilation command.
-# But we should never rely on it, because some make version
-# failed to find it for getopt.o.  Using an explicit command made it work.
+/* 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}
+
+/* This is the default compilation command.
+   But we should never rely on it, because some make version
+   failed to find it for getopt.o.
+   Using an explicit command made it work.  */
 .c.o:
 	${CC} -c ${CPP_CFLAGS} $<
 
-all: ${UTILITIES} ${INSTALLABLES}
+all: ${DONT_INSTALL} ${UTILITIES} ${INSTALLABLES}
+
+#ifdef MOVEMAIL_NEEDS_BLESSING
+blessmail:
+	../src/emacs -batch -l $(srcdir)/../lisp/mail/blessmail.el
+	chmod +x blessmail
+#endif
+
+maybe-blessmail: BLESSMAIL
+#ifdef MOVEMAIL_NEEDS_BLESSING
+/* Don't charge ahead and do it!  Let the installer decide.
+	  ./blessmail ${archlibdir}/movemail  */
+	@if [ `wc -l <blessmail` != 2 ] ; then \
+	  dir=`sed -n -e 's/echo mail directory = \(.*\)/\1/p' blessmail`; \
+	  echo Assuming $$dir is really the mail spool directory, you should; \
+	  echo run  lib-src/blessmail ${archlibdir}/movemail; \
+	  echo as root, to give  movemail  appropriate permissions.; \
+	  echo Do that after running  make install.; \
+	fi
+#endif
 
-### Install the internal utilities.  Until they are installed, we can
-### just run them directly from lib-src.
+/* Install the internal utilities.  Until they are installed, we can
+   just run them directly from lib-src.  */
 ${archlibdir}: all
 	@echo
 	@echo "Installing utilities run internally by Emacs."
-	./make-path ${archlibdir}
+	$(top_srcdir)/mkinstalldirs ${archlibdir}
 	if [ `(cd ${archlibdir} && /bin/pwd)` != `/bin/pwd` ]; then \
 	  for file in ${UTILITIES}; do \
-	    $(INSTALL_PROGRAM) $$file ${archlibdir}/$$file ; \
-	    chmod 755 ${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 \
-	    $(INSTALL_PROGRAM) ${srcdir}/$$file ${archlibdir}/$$file ; \
-	    chmod 755 ${archlibdir}/$$file ; \
+	    $(INSTALL_PROGRAM) ${srcdir}/$$file ${archlibdir}/$$file; \
 	  done ; \
 	fi
-	@echo
-	@echo "Changing the owner and group of Emacs's utility programs to \`bin'."
-	@echo "(You may ignore errors here if you don't care about this.)"
-	-for file in ${UTILITIES} ${SCRIPTS} ; do \
-	  chgrp bin ${archlibdir}/$${file} ; \
-	  chown bin ${archlibdir}/$${file} ; \
-	done
 
-# We don't need to install `wakeup' explicitly, because it will be copied when
-# this whole directory is copied.
-# We use .n, not .new as before, to avoid exceeding the 14-character limit.
 install: ${archlibdir}
 	@echo
 	@echo "Installing utilities for users to run."
 	for file in ${INSTALLABLES} ; do \
-	  cp $${file} ${bindir}/$${file}.n ; \
-	  chmod 755 ${bindir}/$${file}.n ; \
+	  $(INSTALL_PROGRAM) $(INSTALL_STRIP) $${file} ${bindir}/$${file} ; \
+	  chmod a+rx ${bindir}/$${file}; \
 	done
 	for file in ${INSTALLABLE_SCRIPTS} ; do \
-	  cp ${srcdir}/$${file} ${bindir}/$${file}.n ; \
-	  chmod 755 ${bindir}/$${file}.n ; \
-	done
-	-for file in ${INSTALLABLES}  ${INSTALLABLE_SCRIPTS} ; do \
-	  rm -f ${bindir}/$${file} ; \
-	  mv ${bindir}/$${file}.n ${bindir}/$${file} ; \
+	  $(INSTALL_PROGRAM) ${srcdir}/$${file} ${bindir}/$${file} ; \
+	  chmod a+rx ${bindir}/$${file}; \
 	done
 
 uninstall:
@@ -158,16 +300,21 @@ uninstall:
 	(cd ${archlibdir}; \
 	 rm -f ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS})
 
-clean mostlyclean:
-	-rm -f ${INSTALLABLES} ${UTILITIES} core *.o
+mostlyclean:
+	-rm -f core *.o
+
+clean: mostlyclean
+	-rm -f ${INSTALLABLES} ${UTILITIES} ${DONT_INSTALL}
+	-rm -f ../etc/DOC* fns*.el *.tab.c *.tab.h
 
 distclean: clean
-	-rm -f ../etc/DOC* *.tab.c *.tab.h aixcc.c TAGS
+	-rm -f TAGS
+	-rm -f Makefile Makefile.c blessmail
 
-realclean: distclean
+maintainer-clean: distclean
 	true
 
-extraclean: realclean
+extraclean: maintainer-clean
 	-rm -f *~ \#*
 
 unlock:
@@ -176,19 +323,20 @@ unlock:
 relock:
 	chmod u-w $(SOURCES)
 
-# Test the contents of the directory.
+/* Test the contents of the directory.  */
 check:
 	@echo "We don't have any tests for GNU Emacs yet."
 
+tags: TAGS
 TAGS: etags
 	etags *.[ch]
 
-# This verifies that the non-ASCII characters in the file `testfile'
-# have not been clobbered by whatever means were used to copy and
-# distribute Emacs.  If they were clobbered, all the .elc files were
-# clobbered too.
+/* This verifies that the non-ASCII characters in the file `testfile'
+   have not been clobbered by whatever means were used to copy and
+   distribute Emacs.  If they were clobbered, all the .elc files were
+   clobbered too.  */
 test-distrib: ${srcdir}/test-distrib.c
-	$(CC) -o test-distrib ${srcdir}/test-distrib.c
+	$(CC) ${ALL_CFLAGS} -o test-distrib ${srcdir}/test-distrib.c
 	./test-distrib ${srcdir}/testfile
 
 GETOPTOBJS = getopt.o getopt1.o $(ALLOCA)
@@ -197,91 +345,93 @@ getopt.o: ${srcdir}/getopt.c ${srcdir}/getopt.h
 	${CC} -c ${CPP_CFLAGS} ${srcdir}/getopt.c
 getopt1.o: ${srcdir}/getopt1.c ${srcdir}/getopt.h
 	${CC} -c ${CPP_CFLAGS} ${srcdir}/getopt1.c
+alloca.o: ${srcdir}/alloca.c
+	${CC} -Demacs -c ${BASE_CFLAGS} ${srcdir}/alloca.c
+
+#ifdef REGEXP_IN_LIBC
+REGEXPOBJ =
+REGEXPDEPS =
+#else
+REGEXPOBJ = regex.o
+REGEXPDEPS = $(REGEXPOBJ) $(srcdir)/../src/regex.h
+#endif
+
+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) ../src/config.h
-	$(CC) ${CPP_CFLAGS} -DETAGS ${srcdir}/etags.c $(GETOPTOBJS) $(LOADLIBES) -o etags
+etags: ${srcdir}/etags.c $(GETOPTDEPS) $(REGEXPDEPS) ../src/config.h
+	$(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: ${srcdir}/etags.c $(GETOPTDEPS) etags
-	$(CC) ${CPP_CFLAGS} -DCTAGS ${srcdir}/etags.c $(GETOPTOBJS) $(LOADLIBES) -o ctags
+ebrowse: ${srcdir}/ebrowse.c $(GETOPTDEPS) ../src/config.h
+	$(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" ${srcdir}/ebrowse.c $(GETOPTOBJS) $(LOADLIBES) -o ebrowse
 
-wakeup: ${srcdir}/wakeup.c
-	$(CC) ${CPP_CFLAGS} ${srcdir}/wakeup.c $(LOADLIBES) -o wakeup
+/* 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}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o ctags
 
-make-docfile: ${srcdir}/make-docfile.c
-	$(CC) ${CPP_CFLAGS} ${srcdir}/make-docfile.c $(LOADLIBES) -o make-docfile
+profile: ${srcdir}/profile.c ../src/config.h
+	$(CC) ${ALL_CFLAGS} ${srcdir}/profile.c $(LOADLIBES) -o profile
+
+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
-	$(CC) ${CPP_CFLAGS} ${srcdir}/digest-doc.c $(LOADLIBES) -o digest-doc 
+	$(CC) ${ALL_CFLAGS} ${srcdir}/digest-doc.c $(LOADLIBES) -o digest-doc 
 
 sorted-doc: ${srcdir}/sorted-doc.c ${ALLOCA}
-	$(CC) ${CPP_CFLAGS} ${srcdir}/sorted-doc.c ${ALLOCA} $(LOADLIBES) -o sorted-doc
+	$(CC) ${ALL_CFLAGS} ${srcdir}/sorted-doc.c ${ALLOCA} $(LOADLIBES) -o sorted-doc
+
+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
 
-b2m: ${srcdir}/b2m.c ../src/config.h
-	$(CC) ${CPP_CFLAGS} ${srcdir}/b2m.c $(LOADLIBES) -o b2m 
+movemail.o: ${srcdir}/movemail.c ../src/config.h
+	$(CC) -c ${CPP_CFLAGS} -Demacs ${MOVE_FLAGS} ${srcdir}/movemail.c
 
-movemail: ${srcdir}/movemail.c ../src/config.h
-	$(CC) ${CPP_CFLAGS} ${srcdir}/movemail.c $(LOADLIBES) -o movemail
+pop.o: ${srcdir}/pop.c  ../src/config.h
+	$(CC) -c ${CPP_CFLAGS} ${MOVE_FLAGS} ${srcdir}/pop.c
 
 cvtmail: ${srcdir}/cvtmail.c
-	$(CC) ${CPP_CFLAGS} ${srcdir}/cvtmail.c $(LOADLIBES) -o cvtmail
+	$(CC) ${ALL_CFLAGS} ${srcdir}/cvtmail.c $(LOADLIBES) -o cvtmail
 
 fakemail: ${srcdir}/fakemail.c ../src/config.h
-	$(CC) ${CPP_CFLAGS} ${srcdir}/fakemail.c $(LOADLIBES) -o fakemail
+	$(CC) ${ALL_CFLAGS} ${srcdir}/fakemail.c $(LOADLIBES) -o fakemail
 
-yow: ${srcdir}/yow.c ../src/paths.h
-	$(CC) ${CPP_CFLAGS} ${srcdir}/yow.c $(LOADLIBES) -o yow
-
-env: ${srcdir}/env.c ../src/config.h
-	$(CC) -DEMACS ${CPP_CFLAGS} ${srcdir}/env.c $(LOADLIBES) -o env
+yow: ${srcdir}/yow.c ../src/epaths.h
+	$(CC) ${ALL_CFLAGS} ${srcdir}/yow.c $(LOADLIBES) -o yow
 
 emacsserver: ${srcdir}/emacsserver.c ../src/config.h
-	$(CC) ${CPP_CFLAGS} ${srcdir}/emacsserver.c $(LOADLIBES) -o emacsserver
-
-emacsclient: ${srcdir}/emacsclient.c ../src/config.h
-	$(CC) ${CPP_CFLAGS} ${srcdir}/emacsclient.c $(LOADLIBES) -o emacsclient
-
-hexl: ${srcdir}/hexl.c
-	$(CC) ${CPP_CFLAGS} ${srcdir}/hexl.c $(LOADLIBES) -o hexl
+	$(CC) ${ALL_CFLAGS} ${srcdir}/emacsserver.c $(LOADLIBES) -o emacsserver
 
-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) $(ALL_CFLAGS) ${TIMEROBJS} $(LOADLIBES) -o timer
+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
 
-make-path: ${srcdir}/make-path.c ../src/config.h
-	$(CC) $(CPP_CFLAGS) ${srcdir}/make-path.c -o make-path
+hexl: ${srcdir}/hexl.c ../src/config.h
+	$(CC) ${ALL_CFLAGS} ${srcdir}/hexl.c $(LOADLIBES) -o hexl
 
-# These are NOT included in INSTALLABLES or UTILITIES.
-# See ../src/ymakefile.
+/* These are NOT included in INSTALLABLES or UTILITIES.
+   See ../src/Makefile.in.  */
 emacstool: ${srcdir}/emacstool.c
-	$(CC) ${srcdir}/emacstool.c -o emacstool ${CPP_CFLAGS} \
+	$(CC) ${srcdir}/emacstool.c -o emacstool ${ALL_CFLAGS} \
 	  -lsuntool -lsunwindow -lpixrect $(LOADLIBES)
 
-# For SUN Japanese Language Environment
+/* For SUN Japanese Language Environment.  */
 nemacstool: ${srcdir}/emacstool.c
-	$(CC) -o nemacstool -DJLE ${CPP_CFLAGS} ${srcdir}/emacstool.c \
+	$(CC) -o nemacstool -DJLE ${ALL_CFLAGS} ${srcdir}/emacstool.c \
 	  -lsuntool -lmle -lsunwindow -lpixrect $(LOADLIBES)
 
 xvetool: ${srcdir}/emacstool.c
-	$(CC) -o xvetool -DXVIEW ${CPP_CFLAGS} ${srcdir}/emacstool.c \
+	$(CC) -o xvetool -DXVIEW ${ALL_CFLAGS} ${srcdir}/emacstool.c \
 	  -lxview -lX -I$(OPENWINHOME)/include -L$(OPENWINHOME)/lib \
 	  $(LOADLIBES)
 
 xveterm: ${srcdir}/emacstool.c
-	$(CC) -o xveterm -DXVIEW -DTTERM ${CPP_CFLAGS} ${srcdir}/emacstool.c \
+	$(CC) -o xveterm -DXVIEW -DTTERM ${ALL_CFLAGS} ${srcdir}/emacstool.c \
 	  -lxview -lolgx -lX  -I$(OPENWINHOME)/include -L$(OPENWINHOME)/lib \
 	  $(LOADLIBES)
-
-aixcc: ${srcdir}/aixcc.c
-	$(CC) $(CPP_CFLAGS) -o aixcc ${srcdir}/aixcc.c
-
-aixcc.c: ${srcdir}/aixcc.lex
-	lex ${srcdir}/aixcc.lex
-	mv lex.yy.c aixcc.c