[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r99901: Reduce cpp use in Makefile.in
From: |
Dan Nicolaescu |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r99901: Reduce cpp use in Makefile.in. |
Date: |
Wed, 14 Apr 2010 08:36:25 -0700 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 99901
committer: Dan Nicolaescu <address@hidden>
branch nick: trunk
timestamp: Wed 2010-04-14 08:36:25 -0700
message:
Reduce cpp use in Makefile.in.
* Makefile.in (DBUS_CFLAGS, DBUS_LIBS, GCONF_CFLAGS, GCONF_LIBS)
(LIBSOUND, CFLAGS_SOUND, RSVG_LIBS, RSVG_CFLAGS, INTERVALS_H)
(GETLOADAVG_LIBS, RUN_TEMACS): Move to the autoconf section.
(ORDINARY_LINK): Remove, defined in src/s/gnu.h.
(CRT0_COMPILE): Remove, inline it in the only user.
modified:
src/ChangeLog
src/Makefile.in
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2010-04-14 00:33:32 +0000
+++ b/src/ChangeLog 2010-04-14 15:36:25 +0000
@@ -1,3 +1,12 @@
+2010-04-14 Dan Nicolaescu <address@hidden>
+
+ Reduce cpp use in Makefile.in.
+ * Makefile.in (DBUS_CFLAGS, DBUS_LIBS, GCONF_CFLAGS, GCONF_LIBS)
+ (LIBSOUND, CFLAGS_SOUND, RSVG_LIBS, RSVG_CFLAGS, INTERVALS_H)
+ (GETLOADAVG_LIBS, RUN_TEMACS): Move to the autoconf section.
+ (ORDINARY_LINK): Remove, defined in src/s/gnu.h.
+ (CRT0_COMPILE): Remove, inline it in the only user.
+
2010-04-14 Juri Linkov <address@hidden>
* window.c (keys_of_window): Rebind `C-v' from `scroll-up' to
=== modified file 'src/Makefile.in'
--- a/src/Makefile.in 2010-04-12 14:32:10 +0000
+++ b/src/Makefile.in 2010-04-14 15:36:25 +0000
@@ -80,6 +80,24 @@
address@hidden@
+DBUS_CFLAGS = @DBUS_CFLAGS@
+DBUS_LIBS = @DBUS_LIBS@
+
+GCONF_CFLAGS = @GCONF_CFLAGS@
+GCONF_LIBS = @GCONF_LIBS@
+
+LIBSOUND= @LIBSOUND@
+CFLAGS_SOUND= @CFLAGS_SOUND@
+
+RSVG_LIBS= @RSVG_LIBS@
+RSVG_CFLAGS= @RSVG_CFLAGS@
+
+INTERVALS_H = dispextern.h intervals.h composite.h
+
+GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
+
+RUN_TEMACS = `/bin/pwd`/temacs
+
# ========================== start of cpp stuff =======================
/* From here on, comments must be done in C syntax. */
@@ -117,14 +135,6 @@
do not let it interfere with this file. */
#undef register
-/* GNU libc requires ORDINARY_LINK so that its own crt0 is used.
- GNU/Linux is an exception because it uses a funny variant of GNU libc. */
-#ifdef __GNU_LIBRARY__
-#ifndef GNU_LINUX
-#define ORDINARY_LINK
-#endif
-#endif
-
/* Some machines do not find the standard C libraries in the usual place. */
#ifndef ORDINARY_LINK
#ifndef LIB_STANDARD
@@ -201,10 +211,6 @@
#ifndef ORDINARY_LINK
-#ifndef CRT0_COMPILE
-#define CRT0_COMPILE $(CC) -c $(ALL_CFLAGS)
-#endif
-
#ifndef START_FILES
#ifdef NO_REMAP
#define START_FILES pre-crt0.o /lib/crt0.o
@@ -234,16 +240,9 @@
#endif
#ifdef HAVE_DBUS
-DBUS_CFLAGS = @DBUS_CFLAGS@
-DBUS_LIBS = @DBUS_LIBS@
DBUS_OBJ = dbusbind.o
#endif
-#ifdef HAVE_GCONF
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-#endif
-
/* DO NOT use -R. There is a special hack described in lastfile.c
which is used instead. Some initialized data areas are modified
at initial startup, then labeled as part of the text area when
@@ -370,12 +369,6 @@
#endif /* not HAVE_X11 */
#endif /* not HAVE_X_WINDOWS */
-LIBSOUND= @LIBSOUND@
-CFLAGS_SOUND= @CFLAGS_SOUND@
-
-RSVG_LIBS= @RSVG_LIBS@
-RSVG_CFLAGS= @RSVG_CFLAGS@
-
#ifndef ORDINARY_LINK
/* Fix linking if compiled with GCC. */
#ifdef __GNUC__
@@ -445,15 +438,6 @@
#define YMF_PASS_LDFLAGS(flags) flags
#endif
-/* Allow config.h to specify a replacement file for unexec.c. */
-#ifndef UNEXEC
-#define UNEXEC unexec.o
-#endif
-
-INTERVALS_H = dispextern.h intervals.h composite.h
-
-GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
-
#ifdef MSDOS
#ifdef HAVE_X_WINDOWS
MSDOS_OBJ = dosfns.o msdos.o xmenu.o
@@ -844,8 +828,6 @@
@FREETYPE_LIBS@ @FONTCONFIG_LIBS@ @LIBOTF_LIBS@ @M17N_FLT_LIBS@ \
$(GNULIB_VAR) LIB_MATH LIB_STANDARD $(GNULIB_VAR)
-RUN_TEMACS = `/bin/pwd`/temacs
-
all: emacs${EXEEXT} $(OTHER_FILES)
emacs${EXEEXT}: temacs${EXEEXT} ${etc}DOC ${lisp}
@@ -961,7 +943,7 @@
#ifdef AUTO_DEPEND
@-test -d deps || mkdir deps
#endif
- CRT0_COMPILE ${srcdir}/ecrt0.c
+ $(CC) -c $(ALL_CFLAGS) ${srcdir}/ecrt0.c
doc.o: buildobj.h
#ifndef AUTO_DEPEND
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r99901: Reduce cpp use in Makefile.in.,
Dan Nicolaescu <=