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

diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 51f96b1a03..bb8852b6b2 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -1,199 +1,419 @@
-# 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.
 SHELL = /bin/sh
 
-# Allow the user to specify the install program.
-INSTALL = install
-INSTALLFLAGS =
-
-# Things that a user might actually run, which should be installed in bindir.
-INSTALLABLES = etags ctags emacsclient b2m 
+# ==================== Things `configure' will edit ====================
+
+CC=@CC@
+CFLAGS=@CFLAGS@
+ALLOCA=@ALLOCA@
+YACC=@YACC@
+version=@version@
+configuration=@configuration@
+
+# ==================== Where To Install Things ====================
+
+# The default location for installation.  Everything is placed in
+# subdirectories of this directory.  The default values for many of
+# the variables below are expressed in terms of this one, so you may
+# not need to change them.  This is set with the --prefix option to
+# `../configure'.
+prefix=@prefix@
+
+# Like `prefix', but used for architecture-specific files.  This is
+# set with the --exec-prefix option to `../configure'.
+exec_prefix=@exec_prefix@
+
+# Where to install Emacs and other binaries that people will want to
+# run directly (like etags).  This is set with the --bindir option
+# to `../configure'.
+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
+# --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.
+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
+# based on the values of the standard Make variables above.
+
+# Where to put executables to be run by Emacs rather than the user.
+# This path usually includes the Emacs version and configuration name,
+# so that multiple configurations for multiple versions of Emacs may
+# be installed at once.  This can be set with the --archlibdir option
+# to `../configure'.
+archlibdir=@archlibdir@
+
+# ==================== 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 =
+
+# ========================== 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 Emacs runs internally, or during the build process,
-# which should not be installed in bindir.
-UTILITIES= test-distrib 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}
+EXECUTABLES= ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS}
+
+SOURCES = COPYING ChangeLog Makefile.in README emacs.csh \
+	makedoc.com *.[chy] rcs2log vcdiff
+
+# 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
+  /* 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 -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 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: ${DONT_INSTALL} ${UTILITIES} ${INSTALLABLES}
+
+#ifdef MOVEMAIL_NEEDS_BLESSING
+blessmail:
+	../src/emacs -batch -l $(srcdir)/../lisp/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.  */
+${archlibdir}: all
+	@echo
+	@echo "Installing utilities run internally by Emacs."
+	$(top_srcdir)/mkinstalldirs ${archlibdir}
+	if [ `(cd ${archlibdir} && /bin/pwd)` != `/bin/pwd` ]; then \
+	  for file in ${UTILITIES}; do \
+	    $(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; \
+	  done ; \
+	fi
+
+install: ${archlibdir}
+	@echo
+	@echo "Installing utilities for users to run."
+	for file in ${INSTALLABLES} ; do \
+	  $(INSTALL_PROGRAM) $${file} ${bindir}/$${file} ; \
+	  chmod a+rx ${bindir}/$${file}; \
+	done
+	for file in ${INSTALLABLE_SCRIPTS} ; do \
+	  $(INSTALL_PROGRAM) ${srcdir}/$${file} ${bindir}/$${file} ; \
+	  chmod a+rx ${bindir}/$${file}; \
+	done
 
-# These things are edited by ../configure; don't change anything before
-# or including the '='; everything after that gets blown away.
-CC=gcc
-CFLAGS= -g -O
-LOADLIBES=
+uninstall:
+	(cd ${bindir}; \
+	 rm -f ${INSTALLABLES} ${INSTALLABLE_SCRIPTS})
+	(cd ${archlibdir}; \
+	 rm -f ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS})
 
-all: ../arch-lib
+mostlyclean:
+	-rm -f core *.o
 
-../arch-lib: ${EXECUTABLES}
-	for file in ${EXECUTABLES} ; do \
-	  if [ -f $${file} ]; then \
-            if [ -f ../arch-lib/$${file} ]; then \
-	      rm ../arch-lib/$${file} ; \
-	    fi ; \
-	    ln $${file} ../arch-lib ; \
-          fi ; \
-	done
+clean: mostlyclean
+	-rm -f ${INSTALLABLES} ${UTILITIES} ${DONT_INSTALL}
+	-rm -f ../etc/DOC* *.tab.c *.tab.h
+
+distclean: clean
+	-rm -f TAGS
+	-rm -f Makefile Makefile.c blessmail
 
-# We don't need to install `wakeup' explicitly, because it will be copied when
-# this whole directory is copied.
-install: all
-	${INSTALL} ${INSTALLFLAGS} -c emacsclient ${BINDIR}/emacsclient
-	${INSTALL} ${INSTALLFLAGS} -c etags ${BINDIR}/etags
-	${INSTALL} ${INSTALLFLAGS} -c ctags ${BINDIR}/ctags
-	${INSTALL} ${INSTALLFLAGS} -c b2m ${BINDIR}/b2m
-	${INSTALL} ${INSTALLFLAGS} -c -m 444 emacs.1 ${MANDIR}/emacs.${MANEXT}
-
-install.sysv: all
-	-cp emacsclient ${BINDIR}/emacsclient.new
-	-chmod 755 ${BINDIR}/emacsclient.new
-	-chgrp bin ${BINDIR}/emacsclient.new
-	-chown bin ${BINDIR}/emacsclient.new
-	-mv ${BINDIR}/emacsclient.new ${BINDIR}/emacsclient
-	-cp etags ${BINDIR}/etags.new
-	-chmod 755 ${BINDIR}/etags.new
-	-chgrp bin ${BINDIR}/etags.new
-	-chown bin ${BINDIR}/etags.new
-	-mv ${BINDIR}/etags.new ${BINDIR}/etags
-	-cp ctags ${BINDIR}/ctags.new
-	-chmod 755 ${BINDIR}/ctags.new
-	-chgrp bin ${BINDIR}/ctags.new
-	-chown bin ${BINDIR}/ctags.new
-	-mv ${BINDIR}/ctags.new ${BINDIR}/ctags
-	-cp b2m ${BINDIR}/b2m.new
-	-chmod 755 ${BINDIR}/b2m.new
-	-chgrp bin ${BINDIR}/b2m.new
-	-chown bin ${BINDIR}/b2m.new
-	-mv ${BINDIR}/b2m.new ${BINDIR}/b2m
-	-cp emacs.1 ${MANDIR}/emacs.${MANEXT}.new
-	-chmod 444 ${MANDIR}/emacs.${MANEXT}.new
-	-mv ${MANDIR}/emacs.${MANEXT}.new ${MANDIR}/emacs.${MANEXT}
-
-install.xenix:
-	cp etags ctags emacsclient ${BINDIR}
-	chmod 755 ${BINDIR}/etags ${BINDIR}/ctags
-	chmod 755 ${BINDIR}/emacsclient
-	cp b2m ${BINDIR}
-	chmod 755 ${BINDIR}/b2m
-	cp emacs.1 ${MANDIR}/emacs.${MANEXT}
-	chmod 444 ${MANDIR}/emacs.${MANEXT}
-
-
-clean mostlyclean:
-	-rm -f ${INSTALLABLES} ${UTILITIES} core *.o
-
-distclean:
-	-rm -f ${INSTALLABLES} ${UTILITIES} *~ \#* ../etc/DOC* core *.o
-	cd ../arch-lib; rm -f ${EXECUTABLES}
-
-realclean: distclean
-	rm TAGS aixcc.c
-
-# Test the contents of the directory.
+maintainer-clean: distclean
+	true
+
+extraclean: maintainer-clean
+	-rm -f *~ \#*
+
+unlock:
+	chmod u+w $(SOURCES)
+
+relock:
+	chmod u-w $(SOURCES)
+
+/* 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.
-test-distrib: test-distrib.c
-	$(CC) -o test-distrib test-distrib.c
-	./test-distrib
+/* 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) ${ALL_CFLAGS} -o test-distrib ${srcdir}/test-distrib.c
+	./test-distrib ${srcdir}/testfile
 
-GETOPTOBJS = getopt.o getopt1.o
-GETOPTDEPS = $(GETOPTOBJS) getopt.h
-getopt.o: getopt.c getopt.h
-getopt1.o: getopt1.c getopt.h
+GETOPTOBJS = getopt.o getopt1.o $(ALLOCA)
+GETOPTDEPS = $(GETOPTOBJS) ${srcdir}/getopt.h
+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} -c ${BASE_CFLAGS} ${srcdir}/alloca.c
 
-etags: etags.c $(GETOPTDEPS)
-	$(CC) ${CFLAGS} -DETAGS etags.c $(GETOPTOBJS) $(LOADLIBES) -o etags
+#ifdef REGEXP_IN_LIBC
+REGEXPOBJ =
+REGEXPDEPS =
+#else
+REGEXPOBJ = regex.o
+REGEXPDEPS = $(REGEXPOBJ) ../src/regex.h
+#endif
 
-ctags: etags.c $(GETOPTDEPS)
-	$(CC) ${CFLAGS} -DCTAGS etags.c $(GETOPTOBJS) $(LOADLIBES) -o ctags
+regex.o: ../src/regex.c ../src/regex.h ../src/config.h
+	${CC} -c ${BASE_CFLAGS} -DCONFIG_BROKETS -DINHIBIT_STRING_HEADER ${srcdir}/../src/regex.c
 
-wakeup: wakeup.c
-	$(CC) ${CFLAGS} wakeup.c $(LOADLIBES) -o wakeup
+etags: ${srcdir}/etags.c $(GETOPTDEPS) $(REGEXPDEPS) ../src/config.h
+	$(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" -DETAGS_REGEXPS ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o etags
 
-make-docfile: make-docfile.c
-	$(CC) ${CFLAGS} make-docfile.c $(LOADLIBES) -o make-docfile
+/* 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
 
-digest-doc: digest-doc.c
-	$(CC) ${CFLAGS} digest-doc.c $(LOADLIBES) -o digest-doc 
+profile: ${srcdir}/profile.c
+	$(CC) ${ALL_CFLAGS} ${srcdir}/profile.c $(LOADLIBES) -o profile
 
-sorted-doc: sorted-doc.c
-	$(CC) ${CFLAGS} sorted-doc.c $(LOADLIBES) -o sorted-doc
+make-docfile: ${srcdir}/make-docfile.c
+	$(CC) ${ALL_CFLAGS} ${srcdir}/make-docfile.c $(LOADLIBES) -o make-docfile
 
-b2m: b2m.c ../src/config.h
-	$(CC) ${CFLAGS} b2m.c $(LOADLIBES) -o b2m 
+digest-doc: ${srcdir}/digest-doc.c
+	$(CC) ${ALL_CFLAGS} ${srcdir}/digest-doc.c $(LOADLIBES) -o digest-doc 
 
-movemail: movemail.c ../src/config.h
-	$(CC) ${CFLAGS} movemail.c $(LOADLIBES) -o movemail
+sorted-doc: ${srcdir}/sorted-doc.c ${ALLOCA}
+	$(CC) ${ALL_CFLAGS} ${srcdir}/sorted-doc.c ${ALLOCA} $(LOADLIBES) -o sorted-doc
 
-cvtmail: cvtmail.c
-	$(CC) ${CFLAGS} cvtmail.c $(LOADLIBES) -o cvtmail
+b2m: ${srcdir}/b2m.c ../src/config.h
+	$(CC) ${ALL_CFLAGS} ${srcdir}/b2m.c $(LOADLIBES) -o b2m 
 
-fakemail: fakemail.c ../src/config.h
-	$(CC) ${CFLAGS} fakemail.c $(LOADLIBES) -o fakemail
+movemail: movemail.o pop.o $(GETOPTDEPS)
+	$(CC) ${LINK_CFLAGS} ${MOVE_FLAGS} movemail.o pop.o $(GETOPTOBJS) $(LOADLIBES) $(LIBMAIL) $(MOVE_LIBS) -o movemail
 
-yow: yow.c ../src/paths.h
-	$(CC) ${CFLAGS} yow.c $(LOADLIBES) -o yow
+movemail.o: ${srcdir}/movemail.c ../src/config.h
+	$(CC) -c ${CPP_CFLAGS} -Demacs ${MOVE_FLAGS} ${srcdir}/movemail.c
 
-env: env.c ../src/config.h
-	$(CC) -DEMACS ${CFLAGS} env.c $(LOADLIBES) -o env
+pop.o: ${srcdir}/pop.c
+	$(CC) -c ${CPP_CFLAGS} ${MOVE_FLAGS} ${srcdir}/pop.c
 
-emacsserver: emacsserver.c ../src/config.h
-	$(CC) ${CFLAGS} emacsserver.c $(LOADLIBES) -o emacsserver
+cvtmail: ${srcdir}/cvtmail.c
+	$(CC) ${ALL_CFLAGS} ${srcdir}/cvtmail.c $(LOADLIBES) -o cvtmail
 
-emacsclient: emacsclient.c ../src/config.h
-	$(CC) ${CFLAGS} emacsclient.c $(LOADLIBES) -o emacsclient
+fakemail: ${srcdir}/fakemail.c ../src/config.h
+	$(CC) ${ALL_CFLAGS} ${srcdir}/fakemail.c $(LOADLIBES) -o fakemail
 
-hexl: hexl.c
-	$(CC) ${CFLAGS} hexl.c $(LOADLIBES) -o hexl
+yow: ${srcdir}/yow.c ../src/paths.h
+	$(CC) ${ALL_CFLAGS} ${srcdir}/yow.c $(LOADLIBES) -o yow
 
-timer: getdate.o timer.o
-	$(CC) $(CFLAGS) getdate.o timer.o -o timer
+emacsserver: ${srcdir}/emacsserver.c ../src/config.h
+	$(CC) ${ALL_CFLAGS} ${srcdir}/emacsserver.c $(LOADLIBES) -o emacsserver
 
-# These are NOT included in INSTALLABLES or UTILITIES.
-# See ../src/ymakefile.
-emacstool: emacstool.c
-	$(CC) emacstool.c -o emacstool ${CFLAGS} \
+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
+
+/* These are NOT included in INSTALLABLES or UTILITIES.
+   See ../src/Makefile.in.  */
+emacstool: ${srcdir}/emacstool.c
+	$(CC) ${srcdir}/emacstool.c -o emacstool ${ALL_CFLAGS} \
 	  -lsuntool -lsunwindow -lpixrect $(LOADLIBES)
 
-# For SUN Japanese Language Environment
-nemacstool: emacstool.c
-	$(CC) -o nemacstool -DJLE ${CFLAGS} emacstool.c \
+/* For SUN Japanese Language Environment.  */
+nemacstool: ${srcdir}/emacstool.c
+	$(CC) -o nemacstool -DJLE ${ALL_CFLAGS} ${srcdir}/emacstool.c \
 	  -lsuntool -lmle -lsunwindow -lpixrect $(LOADLIBES)
 
-xvetool: emacstool.c
-	$(CC) -o xvetool -DXVIEW ${CFLAGS} emacstool.c \
+xvetool: ${srcdir}/emacstool.c
+	$(CC) -o xvetool -DXVIEW ${ALL_CFLAGS} ${srcdir}/emacstool.c \
 	  -lxview -lX -I$(OPENWINHOME)/include -L$(OPENWINHOME)/lib \
 	  $(LOADLIBES)
 
-xveterm: emacstool.c
-	$(CC) -o xveterm -DXVIEW -DTTERM ${CFLAGS} emacstool.c \
+xveterm: ${srcdir}/emacstool.c
+	$(CC) -o xveterm -DXVIEW -DTTERM ${ALL_CFLAGS} ${srcdir}/emacstool.c \
 	  -lxview -lolgx -lX  -I$(OPENWINHOME)/include -L$(OPENWINHOME)/lib \
 	  $(LOADLIBES)
-
-aixcc: aixcc.c
-	$(CC) $(CFLAGS) -o aixcc aixcc.c
-
-aixcc.c: aixcc.lex
-	lex aixcc.lex
-	mv lex.yy.c aixcc.c