Mercurial > emacs
diff lib-src/Makefile.in @ 96752:9697a5f0281d
various small cleanups detailed in changelogs
| author | Adrian Robert <Adrian.B.Robert@gmail.com> |
|---|---|
| date | Wed, 16 Jul 2008 23:24:46 +0000 |
| parents | d45acf0c8d23 |
| children | 7124d8656633 |
line wrap: on
line diff
--- a/lib-src/Makefile.in Wed Jul 16 23:02:52 2008 +0000 +++ b/lib-src/Makefile.in Wed Jul 16 23:24:46 2008 +0000 @@ -144,7 +144,7 @@ #define NOT_C_CODE #include "../src/config.h" -#if defined(COCOA) +#if defined(NS_IMPL_COCOA) /* Build these programs as universal binaries. */ CFLAGS := $(CFLAGS) -universal /* Add mac-fix-env for OS X systems running NS version. */ @@ -278,14 +278,13 @@ Using an explicit command made it work. */ .c.o: ${CC} -c ${CPP_CFLAGS} $< -#ifdef HAVE_NS + .m.o: -#ifdef GNUSTEP +#ifdef NS_IMPL_GNUSTEP $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -fgnu-runtime -Wno-import -fconstant-string-class=NSConstantString $< #else $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $< #endif -#endif all: ${DONT_INSTALL} ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS} @@ -483,7 +482,7 @@ $(CC) -c ${CPP_CFLAGS} ${srcdir}/update-game-score.c \ -DHAVE_SHARED_GAME_DIR="\"$(gamedir)\"" -#if defined(COCOA) +#if defined(NS_IMPL_COCOA) mac-fix-env: ${srcdir}/mac-fix-env.m $(CC) -o mac-fix-env ${srcdir}/mac-fix-env.m -prebind -framework Foundation #endif