--- Begin Message ---
Subject: |
move OTHER_FILES definition from cpp to autoconf (only affects NS) |
Date: |
Mon, 14 Sep 2009 12:29:52 -0700 (PDT) |
This patch moves OTHER_FILES definition from cpp to autoconf, it only affects
NS.
[configure and src/config.in need to regenerated]
OK to check in?
Index: configure.in
===================================================================
RCS file: /cvsroot/emacs/emacs/configure.in,v
retrieving revision 1.607
diff -u -3 -p -u -p -r1.607 configure.in
--- configure.in 23 Aug 2009 02:15:00 -0000 1.607
+++ configure.in 14 Sep 2009 18:46:36 -0000
@@ -2188,6 +2201,7 @@ if test "${HAVE_NS}" = "yes"; then
fi
# We also have mouse menus.
HAVE_MENUS=yes
+ OTHER_FILES=ns-app
fi
@@ -2598,6 +2612,7 @@ AC_SUBST(GNUSTEP_SYSTEM_HEADERS)
AC_SUBST(GNUSTEP_SYSTEM_LIBRARIES)
AC_SUBST(GNU_OBJC_CFLAGS)
AC_SUBST(LIB_SRC_EXTRA_INSTALLABLES)
+AC_SUBST(OTHER_FILES)
AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION, "${canonical}",
[Define to the canonical
Emacs configuration name.])
@@ -2744,7 +2759,6 @@ AH_BOTTOM([
side does this in s/darwin.h and we cannot
parallel this exactly since GNUstep is multi-OS. */
#ifdef HAVE_NS
-#define OTHER_FILES ns-app
# ifdef NS_IMPL_GNUSTEP
/* See also .m.o rule in Makefile.in */
/* FIXME: are all these flags really needed? Document here why. */
Index: Makefile.in
===================================================================
RCS file: /cvsroot/emacs/emacs/src/Makefile.in,v
retrieving revision 1.446
diff -u -3 -p -u -p -r1.446 Makefile.in
--- Makefile.in 26 Aug 2009 08:28:25 -0000 1.446
+++ Makefile.in 14 Sep 2009 19:27:36 -0000
@@ -886,9 +886,3 @@ LIBES = $(LOADLIBES) $(LIBS) $(LIBX) $(L
@FREETYPE_LIBS@ @FONTCONFIG_LIBS@ @LIBOTF_LIBS@ @M17N_FLT_LIBS@ \
$(GNULIB_VAR) LIB_MATH LIB_STANDARD $(GNULIB_VAR)
-/* Enable recompilation of certain other files depending on system type. */
-
-#ifndef OTHER_FILES
-#define OTHER_FILES
-#endif
-
@@ -898,11 +889,10 @@
-
#ifdef HAVE_SHM
RUN_TEMACS = `/bin/pwd`/temacs -nl
#else
RUN_TEMACS = `/bin/pwd`/temacs
#endif
-all: emacs${EXEEXT} OTHER_FILES
+all: emacs${EXEEXT} @OTHER_FILES@
emacs${EXEEXT}: temacs${EXEEXT} ${etc}DOC ${lisp} ${SOME_MACHINE_LISP}
#ifdef CANNOT_DUMP
--- End Message ---
--- Begin Message ---
Subject: |
Re: bug#4435: move OTHER_FILES definition from cpp to autoconf (only affects NS) |
Date: |
Wed, 16 Sep 2009 23:15:36 -0700 (PDT) |
Stefan Monnier <monnier@IRO.UMontreal.CA> writes:
> > This patch moves OTHER_FILES definition from cpp to autoconf, it only
> > affects NS. [configure and src/config.in need to regenerated]
>
> > OK to check in?
>
> Yes, please, thank you.
Thanks. Done.
--- End Message ---