[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/Makefile.in,v
From: |
Adrian Robert |
Subject: |
[Emacs-diffs] Changes to emacs/src/Makefile.in,v |
Date: |
Wed, 16 Jul 2008 23:24:50 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Adrian Robert <arobert> 08/07/16 23:24:46
Index: src/Makefile.in
===================================================================
RCS file: /sources/emacs/emacs/src/Makefile.in,v
retrieving revision 1.412
retrieving revision 1.413
diff -u -b -r1.412 -r1.413
--- src/Makefile.in 16 Jul 2008 18:06:52 -0000 1.412
+++ src/Makefile.in 16 Jul 2008 23:24:45 -0000 1.413
@@ -113,7 +113,7 @@
#endif
/* Under GNUstep, putting libc on the link line causes problems. */
-#ifdef GNUSTEP
+#ifdef NS_IMPL_GNUSTEP
#define LIB_STANDARD
#endif
@@ -234,7 +234,7 @@
#endif /* not ORDINARY_LINK */
-#ifdef GNUSTEP
+#ifdef NS_IMPL_GNUSTEP
/* Pull in stuff from GNUstep-make. */
FOUNDATION_LIB=gnu
GUI_LIB=gnu
@@ -535,13 +535,13 @@
NS_OBJ= nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o \
fontset.o fringe.o image.o
emacsapp = $(PWD)/../nextstep/build/Emacs.app/
-#ifdef GNUSTEP
+#ifdef NS_IMPL_GNUSTEP
emacsappsrc = ${srcdir}/../nextstep/GNUstep/Emacs.base
emacsbindir = $(emacsapp)
#else
emacsappsrc = ${srcdir}/../nextstep/Cocoa/Emacs.base
emacsbindir = $(emacsapp)/Contents/MacOS/
-#endif /* GNUSTEP */
+#endif /* NS_IMPL_GNUSTEP */
#endif /* HAVE_NS */
#ifdef HAVE_WINDOW_SYSTEM
@@ -969,7 +969,7 @@
temacs${EXEEXT}: $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj}
OBJECTS_MACHINE prefix-args${EXEEXT}
echo "${obj} ${otherobj} " OBJECTS_MACHINE > buildobj.lst
-#ifdef GNUSTEP
+#ifdef NS_IMPL_GNUSTEP
$(CC) -rdynamic YMF_PASS_LDFLAGS (${TEMACS_LDFLAGS}) -o temacs ${obj}
${otherobj} OBJECTS_MACHINE ${LIBES}
#else
$(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${TEMACS_LDFLAGS}) $(LDFLAGS) \
@@ -1355,7 +1355,7 @@
rm -f buildobj.lst
clean: mostlyclean
rm -f emacs-*.*.*${EXEEXT} emacs${EXEEXT}
-#ifdef GNUSTEP
+#ifdef NS_IMPL_GNUSTEP
rm -f *.d
#endif
/* bootstrap-clean is used to clean up just before a bootstrap.
- [Emacs-diffs] Changes to emacs/src/Makefile.in,v, Stefan Monnier, 2008/07/03
- [Emacs-diffs] Changes to emacs/src/Makefile.in,v, Andreas Schwab, 2008/07/08
- [Emacs-diffs] Changes to emacs/src/Makefile.in,v, Andreas Schwab, 2008/07/11
- [Emacs-diffs] Changes to emacs/src/Makefile.in,v, Adrian Robert, 2008/07/15
- [Emacs-diffs] Changes to emacs/src/Makefile.in,v, Adrian Robert, 2008/07/15
- [Emacs-diffs] Changes to emacs/src/Makefile.in,v, David Reitter, 2008/07/16
- [Emacs-diffs] Changes to emacs/src/Makefile.in,v, Andreas Schwab, 2008/07/16
- [Emacs-diffs] Changes to emacs/src/Makefile.in,v,
Adrian Robert <=
- [Emacs-diffs] Changes to emacs/src/Makefile.in,v, Stefan Monnier, 2008/07/16
- [Emacs-diffs] Changes to emacs/src/Makefile.in,v, Adrian Robert, 2008/07/17
- [Emacs-diffs] Changes to emacs/src/Makefile.in,v, Miles Bader, 2008/07/17
- [Emacs-diffs] Changes to emacs/src/Makefile.in,v, Chong Yidong, 2008/07/18
- [Emacs-diffs] Changes to emacs/src/Makefile.in,v, Adrian Robert, 2008/07/19
- [Emacs-diffs] Changes to emacs/src/Makefile.in,v, Adrian Robert, 2008/07/19
- [Emacs-diffs] Changes to emacs/src/Makefile.in,v, Adrian Robert, 2008/07/20
- [Emacs-diffs] Changes to emacs/src/Makefile.in,v, Dan Nicolaescu, 2008/07/23
- [Emacs-diffs] Changes to emacs/src/Makefile.in,v, Dan Nicolaescu, 2008/07/24
- [Emacs-diffs] Changes to emacs/src/Makefile.in,v, Dan Nicolaescu, 2008/07/27