[Emacs-diffs] Changes to emacs/lib-src/Makefile.in

[Juanma Barranquero]

Index: emacs/lib-src/Makefile.in
diff -c emacs/lib-src/Makefile.in:1.133 emacs/lib-src/Makefile.in:1.134
*** emacs/lib-src/Makefile.in:1.133     Mon Jan 20 21:26:04 2003
--- emacs/lib-src/Makefile.in   Fri Jan 31 10:12:57 2003
***************
*** 100,114 ****
  
  # 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=  profile digest-doc sorted-doc movemail cvtmail fakemail \
!             yow hexl update-game-score
  
! DONT_INSTALL= test-distrib make-docfile
  
  # Like UTILITIES, but they're not system-dependent, and should not be
  #  deleted by the distclean target.
--- 100,114 ----
  
  # Things that a user might actually run,
  # which should be installed in bindir.
! INSTALLABLES = address@hidden@ address@hidden@ address@hidden@ 
address@hidden@ address@hidden@
  INSTALLABLE_SCRIPTS = rcs-checkin grep-changelog
  
  # Things that Emacs runs internally, or during the build process,
  #  which should not be installed in bindir.
! UTILITIES=  address@hidden@ address@hidden@ address@hidden@ address@hidden@ 
address@hidden@ address@hidden@ \
!             address@hidden@ address@hidden@ address@hidden@
  
! DONT_INSTALL= address@hidden@ address@hidden@
  
  # Like UTILITIES, but they're not system-dependent, and should not be
  #  deleted by the distclean target.
***************
*** 286,297 ****
  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
--- 286,297 ----
  maybe-blessmail: BLESSMAIL
  #ifdef MOVEMAIL_NEEDS_BLESSING
  /* Don\'t charge ahead and do it!  Let the installer decide.
!         ./blessmail ${archlibdir}/address@hidden@  */
        @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}/address@hidden@; \
!         echo as root, to give  address@hidden@  appropriate permissions.; \
          echo Do that after running  make install.; \
        fi
  #endif
***************
*** 372,385 ****
        @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: ${srcdir}/test-distrib.c
        $(CC) ${ALL_CFLAGS} -o test-distrib ${srcdir}/test-distrib.c
        ./test-distrib ${srcdir}/testfile
  
--- 372,385 ----
        @echo "We don't have any tests for GNU Emacs yet."
  
  tags: TAGS
! TAGS: address@hidden@
        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.  */
! address@hidden@: ${srcdir}/test-distrib.c
        $(CC) ${ALL_CFLAGS} -o test-distrib ${srcdir}/test-distrib.c
        ./test-distrib ${srcdir}/testfile
  
***************
*** 403,436 ****
  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}\"" ${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: etags
        $(CC) ${ALL_CFLAGS} -DCTAGS -DVERSION="\"${version}\"" 
${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o ctags
  
! 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) ${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 $(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) $(LIBS_MAIL) $(LIBS_MOVE) -o movemail
  
  movemail.o: ${srcdir}/movemail.c ../src/config.h
--- 403,436 ----
  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
  
! address@hidden@: ${srcdir}/etags.c $(GETOPTDEPS) $(REGEXPDEPS) ../src/config.h
        $(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" ${srcdir}/etags.c 
$(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o etags
  
! address@hidden@: ${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.  */
! address@hidden@: address@hidden@
        $(CC) ${ALL_CFLAGS} -DCTAGS -DVERSION="\"${version}\"" 
${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o ctags
  
! address@hidden@: ${srcdir}/profile.c ../src/config.h
        $(CC) ${ALL_CFLAGS} ${srcdir}/profile.c $(LOADLIBES) -o profile
  
! address@hidden@: ${srcdir}/make-docfile.c ../src/config.h
        $(CC) ${ALL_CFLAGS} ${srcdir}/make-docfile.c $(LOADLIBES) -o 
make-docfile
  
! address@hidden@: ${srcdir}/digest-doc.c
!       $(CC) ${ALL_CFLAGS} ${srcdir}/digest-doc.c $(LOADLIBES) -o digest-doc
  
! address@hidden@: ${srcdir}/sorted-doc.c ${ALLOCA}
        $(CC) ${ALL_CFLAGS} ${srcdir}/sorted-doc.c ${ALLOCA} $(LOADLIBES) -o 
sorted-doc
  
! address@hidden@: ${srcdir}/b2m.c ../src/config.h $(GETOPTDEPS)
        $(CC) ${ALL_CFLAGS} ${srcdir}/b2m.c  -DVERSION="\"${version}\"" \
!          $(GETOPTOBJS) $(LOADLIBES) -o b2m
  
! address@hidden@: movemail.o pop.o $(GETOPTDEPS)
        $(CC) ${LINK_CFLAGS} ${MOVE_FLAGS} movemail.o pop.o $(GETOPTOBJS) 
$(LOADLIBES) $(LIBS_MAIL) $(LIBS_MOVE) -o movemail
  
  movemail.o: ${srcdir}/movemail.c ../src/config.h
***************
*** 439,483 ****
  pop.o: ${srcdir}/pop.c  ../src/config.h
        $(CC) -c ${CPP_CFLAGS} ${MOVE_FLAGS} ${srcdir}/pop.c
  
! 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/epaths.h
        $(CC) ${ALL_CFLAGS} ${srcdir}/yow.c $(LOADLIBES) -o yow
  
! 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 ../src/config.h
        $(CC) ${ALL_CFLAGS} ${srcdir}/hexl.c $(LOADLIBES) -o hexl
  
! update-game-score: ${srcdir}/update-game-score.c ../src/config.h
        $(CC) ${ALL_CFLAGS} ${srcdir}/update-game-score.c \
          -DHAVE_SHARED_GAME_DIR="\"$(gamedir)\"" \
          $(LOADLIBES) -o update-game-score
  
  /* 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: ${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)
--- 439,483 ----
  pop.o: ${srcdir}/pop.c  ../src/config.h
        $(CC) -c ${CPP_CFLAGS} ${MOVE_FLAGS} ${srcdir}/pop.c
  
! address@hidden@: ${srcdir}/cvtmail.c
        $(CC) ${ALL_CFLAGS} ${srcdir}/cvtmail.c $(LOADLIBES) -o cvtmail
  
! address@hidden@: ${srcdir}/fakemail.c ../src/config.h
        $(CC) ${ALL_CFLAGS} ${srcdir}/fakemail.c $(LOADLIBES) -o fakemail
  
! address@hidden@: ${srcdir}/yow.c ../src/epaths.h
        $(CC) ${ALL_CFLAGS} ${srcdir}/yow.c $(LOADLIBES) -o yow
  
! address@hidden@: ${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
  
! address@hidden@: ${srcdir}/hexl.c ../src/config.h
        $(CC) ${ALL_CFLAGS} ${srcdir}/hexl.c $(LOADLIBES) -o hexl
  
! address@hidden@: ${srcdir}/update-game-score.c ../src/config.h
        $(CC) ${ALL_CFLAGS} ${srcdir}/update-game-score.c \
          -DHAVE_SHARED_GAME_DIR="\"$(gamedir)\"" \
          $(LOADLIBES) -o update-game-score
  
  /* These are NOT included in INSTALLABLES or UTILITIES.
     See ../src/Makefile.in.  */
! address@hidden@: ${srcdir}/emacstool.c
        $(CC) ${srcdir}/emacstool.c -o emacstool ${ALL_CFLAGS} \
          -lsuntool -lsunwindow -lpixrect $(LOADLIBES)
  
  /* For SUN Japanese Language Environment.  */
! address@hidden@: ${srcdir}/emacstool.c
        $(CC) -o nemacstool -DJLE ${ALL_CFLAGS} ${srcdir}/emacstool.c \
          -lsuntool -lmle -lsunwindow -lpixrect $(LOADLIBES)
  
! address@hidden@: ${srcdir}/emacstool.c
        $(CC) -o xvetool -DXVIEW ${ALL_CFLAGS} ${srcdir}/emacstool.c \
          -lxview -lX -I$(OPENWINHOME)/include -L$(OPENWINHOME)/lib \
          $(LOADLIBES)
  
! address@hidden@: ${srcdir}/emacstool.c
        $(CC) -o xveterm -DXVIEW -DTTERM ${ALL_CFLAGS} ${srcdir}/emacstool.c \
          -lxview -lolgx -lX  -I$(OPENWINHOME)/include -L$(OPENWINHOME)/lib \
          $(LOADLIBES)