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

[Juanma Barranquero]

Index: emacs/src/Makefile.in
diff -c emacs/src/Makefile.in:1.267 emacs/src/Makefile.in:1.268
*** emacs/src/Makefile.in:1.267 Tue Jan 21 16:35:24 2003
--- emacs/src/Makefile.in       Fri Jan 31 10:23:09 2003
***************
*** 525,531 ****
  #endif /* not ORDINARY_LINK */
  
  /* Flags to pass to LD only for temacs.  */
! /* Don't split this line with a backslash.  That can cause trouble with 
     some cpps.  */
  TEMACS_LDFLAGS = LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_TEMACS LD_SWITCH_MACHINE 
LD_SWITCH_MACHINE_TEMACS LD_SWITCH_SITE
  
--- 525,531 ----
  #endif /* not ORDINARY_LINK */
  
  /* Flags to pass to LD only for temacs.  */
! /* Don't split this line with a backslash.  That can cause trouble with
     some cpps.  */
  TEMACS_LDFLAGS = LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_TEMACS LD_SWITCH_MACHINE 
LD_SWITCH_MACHINE_TEMACS LD_SWITCH_SITE
  
***************
*** 887,898 ****
  #define OBJECTS_MACHINE
  #endif
  
! all: emacs OTHER_FILES
  
! emacs: temacs ${etc}DOC ${lisp}
  #ifdef CANNOT_DUMP
!       rm -f emacs
!       ln temacs emacs
  #else
  #ifdef HAVE_SHM
        LC_ALL=C ./temacs -nl -batch -l loadup dump
--- 887,898 ----
  #define OBJECTS_MACHINE
  #endif
  
! all: address@hidden@ OTHER_FILES
  
! address@hidden@: address@hidden@ ${etc}DOC ${lisp}
  #ifdef CANNOT_DUMP
!       rm -f address@hidden@
!       ln address@hidden@ address@hidden@
  #else
  #ifdef HAVE_SHM
        LC_ALL=C ./temacs -nl -batch -l loadup dump
***************
*** 915,929 ****
        ${libsrc}make-docfile -d ${srcdir} ${SOME_MACHINE_OBJECTS} ${obj} > 
${etc}DOC
        ${libsrc}make-docfile -a ${etc}DOC -d ${srcdir} ${SOME_MACHINE_LISP} 
${shortlisp}
  
! ${libsrc}make-docfile:
!       cd ${libsrc}; ${MAKE} ${MFLAGS} make-docfile
  
  /* Some systems define this to cause parallel Make-ing.  */
  #ifndef MAKE_PARALLEL
  #define MAKE_PARALLEL
  #endif
  
! temacs: MAKE_PARALLEL $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} 
${otherobj} OBJECTS_MACHINE prefix-args
        $(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${TEMACS_LDFLAGS}) $(LDFLAGS) \
      -o temacs ${STARTFILES} ${obj} ${otherobj}  \
      OBJECTS_MACHINE ${LIBES}
--- 915,929 ----
        ${libsrc}make-docfile -d ${srcdir} ${SOME_MACHINE_OBJECTS} ${obj} > 
${etc}DOC
        ${libsrc}make-docfile -a ${etc}DOC -d ${srcdir} ${SOME_MACHINE_LISP} 
${shortlisp}
  
! address@hidden@:
!       cd ${libsrc}; ${MAKE} ${MFLAGS} address@hidden@
  
  /* Some systems define this to cause parallel Make-ing.  */
  #ifndef MAKE_PARALLEL
  #define MAKE_PARALLEL
  #endif
  
! address@hidden@: MAKE_PARALLEL $(LOCALCPP) $(STARTFILES) stamp-oldxmenu 
${obj} ${otherobj} OBJECTS_MACHINE address@hidden@
        $(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${TEMACS_LDFLAGS}) $(LDFLAGS) \
      -o temacs ${STARTFILES} ${obj} ${otherobj}  \
      OBJECTS_MACHINE ${LIBES}
***************
*** 931,937 ****
  /* We don't use ALL_LDFLAGS because LD_SWITCH_SYSTEM and LD_SWITCH_MACHINE
     often contain options that have to do with using Emacs's crt0,
     which are only good with temacs.  */
! prefix-args: prefix-args.c $(config_h)
        $(CC) $(ALL_CFLAGS) $(LDFLAGS) ${srcdir}/prefix-args.c -o prefix-args
  
  /* Don't lose if this was not defined.  */
--- 931,937 ----
  /* We don't use ALL_LDFLAGS because LD_SWITCH_SYSTEM and LD_SWITCH_MACHINE
     often contain options that have to do with using Emacs's crt0,
     which are only good with temacs.  */
! address@hidden@: prefix-args.c $(config_h)
        $(CC) $(ALL_CFLAGS) $(LDFLAGS) ${srcdir}/prefix-args.c -o prefix-args
  
  /* Don't lose if this was not defined.  */
***************
*** 950,956 ****
     to both ensure that lwlib gets remade based on its dependencies
     in its own makefile,
     and remake temacs if lwlib gets changed by this.  */
! stamp-oldxmenu: ${OLDXMENU} ../src/$(OLDXMENU) 
        touch stamp-oldxmenu
  /* Supply an ordering for parallel make.  */
  ../src/$(OLDXMENU): ${OLDXMENU}
--- 950,956 ----
     to both ensure that lwlib gets remade based on its dependencies
     in its own makefile,
     and remake temacs if lwlib gets changed by this.  */
! stamp-oldxmenu: ${OLDXMENU} ../src/$(OLDXMENU)
        touch stamp-oldxmenu
  /* Supply an ordering for parallel make.  */
  ../src/$(OLDXMENU): ${OLDXMENU}
***************
*** 1253,1277 ****
        ${emacsapp}Contents/Resources/English.lproj/InfoPlist.strings
  macosx-app: macosx-bundle ${emacsapp}Contents/MacOS/Emacs \
    ${emacsapp}Contents/Resources/Emacs.rsrc
! ${emacsapp}Contents/MacOS/Emacs: emacs
        mkdir -p ${emacsapp}Contents/MacOS/;
!       cd ${emacsapp}Contents/MacOS/; cp ../../../../src/emacs Emacs
  ${emacsapp}Contents/Resources/Emacs.rsrc: ../mac/src/Emacs.r
        /Developer/Tools/Rez -useDF \
        -o ${emacsapp}Contents/Resources/Emacs.rsrc \
        /System/Library/Frameworks/Carbon.framework/Headers/Carbon.r $<
  #endif
  
! ${libsrc}emacstool: ${libsrc}emacstool.c
!       cd ${libsrc}; ${MAKE} ${MFLAGS} emacstool
  bootstrapclean:
!       rm -f bootstrap-emacs
  mostlyclean:
!       rm -f temacs prefix-args core *.core \#* *.o libXMenu11.a liblw.a
        rm -f ../etc/DOC
!       rm -f bootstrap-emacs
  clean: mostlyclean
!       rm -f emacs-* emacs
  /**/# This is used in making a distribution.
  /**/# Do not use it on development directories!
  distclean: clean
--- 1253,1277 ----
        ${emacsapp}Contents/Resources/English.lproj/InfoPlist.strings
  macosx-app: macosx-bundle ${emacsapp}Contents/MacOS/Emacs \
    ${emacsapp}Contents/Resources/Emacs.rsrc
! ${emacsapp}Contents/MacOS/Emacs: address@hidden@
        mkdir -p ${emacsapp}Contents/MacOS/;
!       cd ${emacsapp}Contents/MacOS/; cp ../../../../src/address@hidden@ 
address@hidden@
  ${emacsapp}Contents/Resources/Emacs.rsrc: ../mac/src/Emacs.r
        /Developer/Tools/Rez -useDF \
        -o ${emacsapp}Contents/Resources/Emacs.rsrc \
        /System/Library/Frameworks/Carbon.framework/Headers/Carbon.r $<
  #endif
  
! address@hidden@: ${libsrc}emacstool.c
!       cd ${libsrc}; ${MAKE} ${MFLAGS} address@hidden@
  bootstrapclean:
!       rm -f address@hidden@
  mostlyclean:
!       rm -f address@hidden@ address@hidden@ core *.core \#* *.o libXMenu11.a 
liblw.a
        rm -f ../etc/DOC
!       rm -f address@hidden@
  clean: mostlyclean
!       rm -f address@hidden@ address@hidden@
  /**/# This is used in making a distribution.
  /**/# Do not use it on development directories!
  distclean: clean
***************
*** 1284,1290 ****
        @echo "it deletes files that may require special tools to rebuild."
        rm -f TAGS
  versionclean:
!       -rm -f emacs emacs-* ../etc/DOC*
  extraclean: distclean
        -rm -f *~ \#* m/?*~ s/?*~
  
--- 1284,1290 ----
        @echo "it deletes files that may require special tools to rebuild."
        rm -f TAGS
  versionclean:
!       -rm -f address@hidden@ emacs-* ../etc/DOC*
  extraclean: distclean
        -rm -f *~ \#* m/?*~ s/?*~
  
***************
*** 1302,1308 ****
  /* Arrange to make a tags table TAGS-LISP for ../lisp,
     plus TAGS for the C files, which includes ../lisp/TAGS by reference.  */
  
! ctagsfiles1 = [xyzXYZ]*.[hc] 
  ctagsfiles2 = [a-wA-W]*.[hc]
  
  TAGS: $(srcdir)/$(ctagsfiles1) $(srcdir)/$(ctagsfiles2)
--- 1302,1308 ----
  /* Arrange to make a tags table TAGS-LISP for ../lisp,
     plus TAGS for the C files, which includes ../lisp/TAGS by reference.  */
  
! ctagsfiles1 = [xyzXYZ]*.[hc]
  ctagsfiles2 = [a-wA-W]*.[hc]
  
  TAGS: $(srcdir)/$(ctagsfiles1) $(srcdir)/$(ctagsfiles2)
***************
*** 1322,1341 ****
  
  /* Bootstrapping.  */
  
! bootstrap: bootstrap-emacs
  
! /* Dump an Emacs executable named bootstrap-emacs containing the 
     files from loadup.el in source form.  */
  
! bootstrap-emacs: temacs
  #ifdef CANNOT_DUMP
!       ln temacs bootstrap-emacs
  #else
  #ifdef HAVE_SHM
        ./temacs -nl -batch -l loadup bootstrap
  #else /* ! defined (HAVE_SHM) */
        ./temacs --batch --load loadup bootstrap
  #endif /* ! defined (HAVE_SHM) */
  #endif /* ! defined (CANNOT_DUMP) */
-       mv -f emacs bootstrap-emacs
  
--- 1322,1341 ----
  
  /* Bootstrapping.  */
  
! bootstrap: address@hidden@
  
! /* Dump an Emacs executable named bootstrap-emacs containing the
     files from loadup.el in source form.  */
  
! address@hidden@: address@hidden@
  #ifdef CANNOT_DUMP
!       ln address@hidden@ address@hidden@
  #else
  #ifdef HAVE_SHM
        ./temacs -nl -batch -l loadup bootstrap
  #else /* ! defined (HAVE_SHM) */
        ./temacs --batch --load loadup bootstrap
  #endif /* ! defined (HAVE_SHM) */
+       mv -f address@hidden@ address@hidden@
  #endif /* ! defined (CANNOT_DUMP) */