comparison 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
comparison
equal deleted inserted replaced
96751:5e647deae824 96752:9697a5f0281d
142 142
143 #define THIS_IS_MAKEFILE 143 #define THIS_IS_MAKEFILE
144 #define NOT_C_CODE 144 #define NOT_C_CODE
145 #include "../src/config.h" 145 #include "../src/config.h"
146 146
147 #if defined(COCOA) 147 #if defined(NS_IMPL_COCOA)
148 /* Build these programs as universal binaries. */ 148 /* Build these programs as universal binaries. */
149 CFLAGS := $(CFLAGS) -universal 149 CFLAGS := $(CFLAGS) -universal
150 /* Add mac-fix-env for OS X systems running NS version. */ 150 /* Add mac-fix-env for OS X systems running NS version. */
151 INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} b2m${EXEEXT} ebrowse${EXEEXT} mac-fix-env${EXEEXT} 151 INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} b2m${EXEEXT} ebrowse${EXEEXT} mac-fix-env${EXEEXT}
152 #endif 152 #endif
276 But we should never rely on it, because some make version 276 But we should never rely on it, because some make version
277 failed to find it for getopt.o. 277 failed to find it for getopt.o.
278 Using an explicit command made it work. */ 278 Using an explicit command made it work. */
279 .c.o: 279 .c.o:
280 ${CC} -c ${CPP_CFLAGS} $< 280 ${CC} -c ${CPP_CFLAGS} $<
281 #ifdef HAVE_NS 281
282 .m.o: 282 .m.o:
283 #ifdef GNUSTEP 283 #ifdef NS_IMPL_GNUSTEP
284 $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -fgnu-runtime -Wno-import -fconstant-string-class=NSConstantString $< 284 $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -fgnu-runtime -Wno-import -fconstant-string-class=NSConstantString $<
285 #else 285 #else
286 $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $< 286 $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $<
287 #endif
288 #endif 287 #endif
289 288
290 all: ${DONT_INSTALL} ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS} 289 all: ${DONT_INSTALL} ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS}
291 290
292 /* These targets copy the scripts into the build directory 291 /* These targets copy the scripts into the build directory
481 480
482 update-game-score.o: ${srcdir}/update-game-score.c ../src/config.h $(GETOPT_H) 481 update-game-score.o: ${srcdir}/update-game-score.c ../src/config.h $(GETOPT_H)
483 $(CC) -c ${CPP_CFLAGS} ${srcdir}/update-game-score.c \ 482 $(CC) -c ${CPP_CFLAGS} ${srcdir}/update-game-score.c \
484 -DHAVE_SHARED_GAME_DIR="\"$(gamedir)\"" 483 -DHAVE_SHARED_GAME_DIR="\"$(gamedir)\""
485 484
486 #if defined(COCOA) 485 #if defined(NS_IMPL_COCOA)
487 mac-fix-env: ${srcdir}/mac-fix-env.m 486 mac-fix-env: ${srcdir}/mac-fix-env.m
488 $(CC) -o mac-fix-env ${srcdir}/mac-fix-env.m -prebind -framework Foundation 487 $(CC) -o mac-fix-env ${srcdir}/mac-fix-env.m -prebind -framework Foundation
489 #endif 488 #endif