X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/c61a529e292d3c71942e23b707f2fdd1241f0f9d..70c750c0e8e54947399245af6c8b49f908c8939c:/lib-src/Makefile.in diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index 5bdb8e85f0..44e8089c4f 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. @@ -58,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@ @@ -82,18 +85,20 @@ 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 +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= 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 +127,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 +141,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 +183,56 @@ MOVE_LIBS= #define BLESSMAIL #endif -LOADLIBES=LIBS_SYSTEM LIBS_MACHINE +#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 -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 +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 @@ -227,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)` \ @@ -237,16 +282,16 @@ ${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." 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 \ $(INSTALL_PROGRAM) ${srcdir}/$${file} ${bindir}/$${file} ; \ + chmod a+rx ${bindir}/$${file}; \ done uninstall: @@ -260,11 +305,11 @@ 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 - -rm -f Makefile Makefile.in blessmail + -rm -f Makefile Makefile.c blessmail maintainer-clean: distclean true @@ -282,6 +327,7 @@ relock: check: @echo "We don't have any tests for GNU Emacs yet." +tags: TAGS TAGS: etags etags *.[ch] @@ -300,34 +346,34 @@ getopt.o: ${srcdir}/getopt.c ${srcdir}/getopt.h 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 + ${CC} -Demacs -c ${BASE_CFLAGS} ${srcdir}/alloca.c #ifdef REGEXP_IN_LIBC 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 +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 + +ebrowse: ${srcdir}/ebrowse.c $(GETOPTDEPS) ../src/config.h + $(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" ${srcdir}/ebrowse.c $(GETOPTOBJS) $(LOADLIBES) -o ebrowse /* 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}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o ctags -profile: ${srcdir}/profile.c +profile: ${srcdir}/profile.c ../src/config.h $(CC) ${ALL_CFLAGS} ${srcdir}/profile.c $(LOADLIBES) -o profile -make-docfile: ${srcdir}/make-docfile.c +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 @@ -336,16 +382,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} ${MOVE_FLAGS} ${srcdir}/movemail.c + $(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 @@ -354,30 +401,22 @@ 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 +hexl: ${srcdir}/hexl.c ../src/config.h $(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)