diff lib-src/Makefile.in @ 97354:0defde3a9c5f

* s/darwin.h (OTHER_FILES): Do not define here, defined in config.in. * Makefile.in (ALL_OBJC_CFLAGS): New variable. (.m.o): Use it. * config.in: Regenerate. * Makefile.in (INSTALLABLES): Add LIB_SRC_EXTRA_INSTALLABLES. Do not special case for NS_IMPL_COCOA. * configure.in (LIB_SRC_EXTRA_INSTALLABLES): New variable. AC_SUBST it. (GNU_OBJC_CFLAGS): Define as a shell variable instead of #define. AC_SUBST it. (OTHER_FILES): Always define for HAVE_NS. (C_SWITCH_X_SYSTEM): Don't define as empty for NS_IMPL_COCOA. * configure: Regenerate.
author Dan Nicolaescu <dann@ics.uci.edu>
date Thu, 07 Aug 2008 14:21:43 +0000
parents 4fb874878836
children a9f7e446141d
line wrap: on
line diff
--- a/lib-src/Makefile.in	Thu Aug 07 09:29:58 2008 +0000
+++ b/lib-src/Makefile.in	Thu Aug 07 14:21:43 2008 +0000
@@ -105,7 +105,7 @@
 
 # Things that a user might actually run,
 # which should be installed in bindir.
-INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} b2m${EXEEXT} ebrowse${EXEEXT}
+INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} b2m${EXEEXT} ebrowse${EXEEXT} @LIB_SRC_EXTRA_INSTALLABLES@
 INSTALLABLE_SCRIPTS = rcs-checkin grep-changelog
 
 # Things that Emacs runs internally, or during the build process,
@@ -144,11 +144,6 @@
 #define NOT_C_CODE
 #include "../src/config.h"
 
-#if defined(NS_IMPL_COCOA)
-/* Add mac-fix-env for OS X systems running NS version. */
-INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} b2m${EXEEXT} ebrowse${EXEEXT} mac-fix-env${EXEEXT}
-#endif
-
 /* Some s/SYSTEM.h files define this to request special libraries.  */
 #ifndef LIBS_SYSTEM
 #define LIBS_SYSTEM