*** ed19:[lib-src]makefile.in	Wed Mar  2 20:39:23 1994
--- ed1928:[lib-src]makefile.in_in	Fri Jul 29 20:32:10 1994
***************
*** 1,11 ****
! # 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.
! 
! # 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
  
  # Avoid trouble on systems where the `SHELL' variable might be
--- 1,20 ----
! # Makefile for lib-src subdirectory in GNU Emacs.
! # Copyright (C) 1985, 1987, 1988, 1993, 1994 Free Software Foundation, Inc.
! 
! # 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, 675 Mass Ave, Cambridge, MA 02139, USA.  */
  
  # Avoid trouble on systems where the `SHELL' variable might be
***************
*** 18,26 ****
  CFLAGS=@CFLAGS@
  ALLOCA=@ALLOCA@
- C_SWITCH_SYSTEM=@c_switch_system@
- LOADLIBES=@libsrc_libs@
  YACC=@YACC@
  version=@version@
! configname=@configuration@
  
  # ==================== Where To Install Things ====================
--- 27,33 ----
  CFLAGS=@CFLAGS@
  ALLOCA=@ALLOCA@
  YACC=@YACC@
  version=@version@
! configuration=@configuration@
  
  # ==================== Where To Install Things ====================
***************
*** 67,71 ****
  archlibdir=@archlibdir@
  
! # ==================== Utility Programs for the Build ====================
  
  # ../configure figures out the correct values for these.
--- 74,78 ----
  archlibdir=@archlibdir@
  
! # ==================== Utility Programs for the Build =================
  
  # ../configure figures out the correct values for these.
***************
*** 74,90 ****
  INSTALL_DATA = @INSTALL_DATA@
  
! # ============================= Targets ==============================
  
! # 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 make-path wakeup make-docfile digest-doc sorted-doc \
! 	movemail cvtmail fakemail yow env emacsserver hexl timer
  
  # Like UTILITIES, but they're not system-dependent, and should not be
! # deleted by the distclean target.
  SCRIPTS= rcs2log vcdiff
  
--- 81,98 ----
  INSTALL_DATA = @INSTALL_DATA@
  
! # ========================== 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 make-path wakeup profile make-docfile digest-doc \
! 	sorted-doc movemail cvtmail fakemail yow emacsserver hexl timer
  
  # Like UTILITIES, but they're not system-dependent, and should not be
! #  deleted by the distclean target.
  SCRIPTS= rcs2log vcdiff
  
***************
*** 94,108 ****
  	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 \
     -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} $<
--- 102,169 ----
  	makedoc.com *.[chy] rcs2log vcdiff
  
! # ========================== start of cpp stuff =======================
! /* From here on, comments must be done in C syntax.  */
! 
! #define NO_SHORTNAMES
! #define THIS_IS_YMAKEFILE
! #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 s/*.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.  */
! #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
! 
! LOADLIBES=LIBS_SYSTEM LIBS_MACHINE
! 
! /* 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 \
!    -I. -I../src -I${srcdir} -I${srcdir}/../src ${LDFLAGS} ${CPPFLAGS} ${CFLAGS}
! LINK_CFLAGS = C_SWITCH_SYSTEM C_SWITCH_MACHINE -Demacs -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 \
     -I. -I../src -I${srcdir} -I${srcdir}/../src ${CPPFLAGS} ${CFLAGS}
! ALLOCA_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} $<
***************
*** 110,115 ****
  all: ${UTILITIES} ${INSTALLABLES}
  
! ### Install the internal utilities.  Until they are installed, we can
! ### just run them directly from lib-src.
  ${archlibdir}: all
  	@echo
--- 171,195 ----
  all: ${UTILITIES} ${INSTALLABLES}
  
! #ifdef MOVEMAIL_NEEDS_BLESSING
! blessmail:
! 	../src/emacs -batch -l ../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
***************
*** 118,147 ****
  	if [ `(cd ${archlibdir} && /bin/pwd)` != `/bin/pwd` ]; then \
  	  for file in ${UTILITIES}; do \
! 	    $(INSTALL_PROGRAM) $$file ${archlibdir}/$$file ; \
! 	    chmod 755 ${archlibdir}/$$file ; \
  	  done ; \
  	  for file in ${SCRIPTS}; do \
! 	    $(INSTALL_PROGRAM) ${srcdir}/$$file ${archlibdir}/$$file ; \
! 	    chmod 755 ${archlibdir}/$$file ; \
  	  done ; \
  	fi
  
! # 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 ; \
  	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} ; \
  	done
  
--- 198,221 ----
  	if [ `(cd ${archlibdir} && /bin/pwd)` != `/bin/pwd` ]; then \
  	  for file in ${UTILITIES}; do \
! 	    (cd ..; $(INSTALL_PROGRAM) lib-src/$$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); \
  	  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}) ; \
  	done
  	for file in ${INSTALLABLE_SCRIPTS} ; do \
! 	  (cd ..; $(INSTALL_PROGRAM) ${srcdir}/$${file} ${bindir}/$${file}) ; \
  	done
  
***************
*** 160,163 ****
--- 234,238 ----
  distclean: clean
  	-rm -f ../etc/DOC* *.tab.c *.tab.h aixcc.c TAGS
+ 	-rm -f Makefile Makefile.in blessmail
  
  realclean: distclean
***************
*** 173,177 ****
  	chmod u-w $(SOURCES)
  
! # Test the contents of the directory.
  check:
  	@echo "We don't have any tests for GNU Emacs yet."
--- 248,252 ----
  	chmod u-w $(SOURCES)
  
! /* Test the contents of the directory.  */
  check:
  	@echo "We don't have any tests for GNU Emacs yet."
***************
*** 180,189 ****
  	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: ${srcdir}/test-distrib.c
! 	$(CC) -o test-distrib ${srcdir}/test-distrib.c
  	./test-distrib ${srcdir}/testfile
  
--- 255,264 ----
  	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: ${srcdir}/test-distrib.c
! 	$(CC) ${ALL_CFLAGS} -o test-distrib ${srcdir}/test-distrib.c
  	./test-distrib ${srcdir}/testfile
  
***************
*** 194,244 ****
  getopt1.o: ${srcdir}/getopt1.c ${srcdir}/getopt.h
  	${CC} -c ${CPP_CFLAGS} ${srcdir}/getopt1.c
  
  etags: ${srcdir}/etags.c $(GETOPTDEPS) ../src/config.h
! 	$(CC) ${CPP_CFLAGS} -DETAGS ${srcdir}/etags.c $(GETOPTOBJS) $(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
  
  wakeup: ${srcdir}/wakeup.c
! 	$(CC) ${CPP_CFLAGS} ${srcdir}/wakeup.c $(LOADLIBES) -o wakeup
  
  make-docfile: ${srcdir}/make-docfile.c
! 	$(CC) ${CPP_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 
  
  sorted-doc: ${srcdir}/sorted-doc.c ${ALLOCA}
! 	$(CC) ${CPP_CFLAGS} ${srcdir}/sorted-doc.c ${ALLOCA} $(LOADLIBES) -o sorted-doc
  
  b2m: ${srcdir}/b2m.c ../src/config.h
! 	$(CC) ${CPP_CFLAGS} ${srcdir}/b2m.c $(LOADLIBES) -o b2m 
  
  movemail: ${srcdir}/movemail.c ../src/config.h
! 	$(CC) ${CPP_CFLAGS} ${srcdir}/movemail.c $(LOADLIBES) -o movemail
  
  cvtmail: ${srcdir}/cvtmail.c
! 	$(CC) ${CPP_CFLAGS} ${srcdir}/cvtmail.c $(LOADLIBES) -o cvtmail
  
  fakemail: ${srcdir}/fakemail.c ../src/config.h
! 	$(CC) ${CPP_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
  
  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
  
  TIMEROBJS=getdate.o timer.o $(ALLOCA)
--- 269,321 ----
  getopt1.o: ${srcdir}/getopt1.c ${srcdir}/getopt.h
  	${CC} -c ${CPP_CFLAGS} ${srcdir}/getopt1.c
+ alloca.o: ${srcdir}/alloca.c
+ 	${CC} -c ${ALLOCA_CFLAGS} ${srcdir}/alloca.c
  
  etags: ${srcdir}/etags.c $(GETOPTDEPS) ../src/config.h
! 	$(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(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) ${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
! 
! profile: ${srcdir}/profile.c
! 	$(CC) ${ALL_CFLAGS} ${srcdir}/profile.c $(LOADLIBES) -o profile
  
  make-docfile: ${srcdir}/make-docfile.c
! 	$(CC) ${ALL_CFLAGS} ${srcdir}/make-docfile.c $(LOADLIBES) -o make-docfile
  
  digest-doc: ${srcdir}/digest-doc.c
! 	$(CC) ${ALL_CFLAGS} ${srcdir}/digest-doc.c $(LOADLIBES) -o digest-doc 
  
  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 
  
  movemail: ${srcdir}/movemail.c ../src/config.h
! 	$(CC) ${ALL_CFLAGS} ${srcdir}/movemail.c $(LOADLIBES) -o movemail
  
  cvtmail: ${srcdir}/cvtmail.c
! 	$(CC) ${ALL_CFLAGS} ${srcdir}/cvtmail.c $(LOADLIBES) -o cvtmail
  
  fakemail: ${srcdir}/fakemail.c ../src/config.h
! 	$(CC) ${ALL_CFLAGS} ${srcdir}/fakemail.c $(LOADLIBES) -o fakemail
  
  yow: ${srcdir}/yow.c ../src/paths.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
  
  hexl: ${srcdir}/hexl.c
! 	$(CC) ${ALL_CFLAGS} ${srcdir}/hexl.c $(LOADLIBES) -o hexl
  
  TIMEROBJS=getdate.o timer.o $(ALLOCA)
***************
*** 250,281 ****
  	$(CC) -c $(CPP_CFLAGS) ${srcdir}/timer.c
  timer: ${TIMEROBJS}
! 	$(CC) $(ALL_CFLAGS) ${TIMEROBJS} $(LOADLIBES) -o timer
  
  make-path: ${srcdir}/make-path.c ../src/config.h
! 	$(CC) $(CPP_CFLAGS) ${srcdir}/make-path.c -o make-path
  
! # These are NOT included in INSTALLABLES or UTILITIES.
! # See ../src/ymakefile.
  emacstool: ${srcdir}/emacstool.c
! 	$(CC) ${srcdir}/emacstool.c -o emacstool ${CPP_CFLAGS} \
  	  -lsuntool -lsunwindow -lpixrect $(LOADLIBES)
  
! # For SUN Japanese Language Environment
  nemacstool: ${srcdir}/emacstool.c
! 	$(CC) -o nemacstool -DJLE ${CPP_CFLAGS} ${srcdir}/emacstool.c \
  	  -lsuntool -lmle -lsunwindow -lpixrect $(LOADLIBES)
  
  xvetool: ${srcdir}/emacstool.c
! 	$(CC) -o xvetool -DXVIEW ${CPP_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 \
  	  -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
--- 327,358 ----
  	$(CC) -c $(CPP_CFLAGS) ${srcdir}/timer.c
  timer: ${TIMEROBJS}
! 	$(CC) $(LINK_CFLAGS) ${TIMEROBJS} $(LOADLIBES) -o timer
  
  make-path: ${srcdir}/make-path.c ../src/config.h
! 	$(CC) $(ALL_CFLAGS) ${srcdir}/make-path.c -o make-path
  
! /* These are NOT included in INSTALLABLES or UTILITIES.
!    See ../src/Makefile.in.in.  */
  emacstool: ${srcdir}/emacstool.c
! 	$(CC) ${srcdir}/emacstool.c -o emacstool ${ALL_CFLAGS} \
  	  -lsuntool -lsunwindow -lpixrect $(LOADLIBES)
  
! /* For SUN Japanese Language Environment.  */
  nemacstool: ${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 ${ALL_CFLAGS} ${srcdir}/emacstool.c \
  	  -lxview -lX -I$(OPENWINHOME)/include -L$(OPENWINHOME)/lib \
  	  $(LOADLIBES)
  
  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: ${srcdir}/aixcc.c
! 	$(CC) $(ALL_CFLAGS) -o aixcc ${srcdir}/aixcc.c
  
  aixcc.c: ${srcdir}/aixcc.lex