comparison src/Makefile.in.in @ 410:de805c49cfc1 r21-2-35

Import from CVS: tag r21-2-35
author cvs
date Mon, 13 Aug 2007 11:19:21 +0200
parents b8cc9ab3f761
children 697ef44129c6
comparison
equal deleted inserted replaced
409:301b9ebbdf3b 410:de805c49cfc1
134 X11_libs = $(LIBI18N) 134 X11_libs = $(LIBI18N)
135 #endif /* HAVE_X_WINDOWS */ 135 #endif /* HAVE_X_WINDOWS */
136 136
137 #if defined (HEAP_IN_DATA) && !defined(PDUMP) 137 #if defined (HEAP_IN_DATA) && !defined(PDUMP)
138 sheap_obj=sheap.o 138 sheap_obj=sheap.o
139 #endif
140
141 #if defined(MINGW) || defined(CYGWIN)
142 res_obj=xemacs_res.o
139 #endif 143 #endif
140 144
141 ## -Demacs is needed to make some files produce the correct version 145 ## -Demacs is needed to make some files produce the correct version
142 ## for use in Emacs. 146 ## for use in Emacs.
143 147
189 macros.o marker.o md5.o minibuf.o objects.o opaque.o\ 193 macros.o marker.o md5.o minibuf.o objects.o opaque.o\
190 print.o process.o profile.o\ 194 print.o process.o profile.o\
191 rangetab.o redisplay.o redisplay-output.o regex.o\ 195 rangetab.o redisplay.o redisplay-output.o regex.o\
192 search.o select.o $(sheap_obj) signal.o sound.o\ 196 search.o select.o $(sheap_obj) signal.o sound.o\
193 specifier.o strftime.o symbols.o syntax.o sysdep.o\ 197 specifier.o strftime.o symbols.o syntax.o sysdep.o\
194 undo.o $(x_objs) widget.o window.o 198 undo.o $(x_objs) widget.o window.o $(res_obj)
195 199
196 obj_rtl = $(objs:.o=.c.rtl) 200 obj_rtl = $(objs:.o=.c.rtl)
197 201
198 #ifdef REL_ALLOC 202 #ifdef REL_ALLOC
199 rallocdocsrc = ralloc.c 203 rallocdocsrc = ralloc.c
340 @if test -f $@; then if test -f SATISFIED; then \ 344 @if test -f $@; then if test -f SATISFIED; then \
341 echo "Testing for Lisp shadows ..."; \ 345 echo "Testing for Lisp shadows ..."; \
342 ./${PROGNAME} -batch -vanilla -f list-load-path-shadows; fi; \ 346 ./${PROGNAME} -batch -vanilla -f list-load-path-shadows; fi; \
343 $(RM) SATISFIED; exit 0; fi; \ 347 $(RM) SATISFIED; exit 0; fi; \
344 if test -f SATISFIED; then $(RM) SATISFIED; exit 1; fi; \ 348 if test -f SATISFIED; then $(RM) SATISFIED; exit 1; fi; \
349 @$(RM) $@; \
345 $(RECURSIVE_MAKE) $@; 350 $(RECURSIVE_MAKE) $@;
346 #else 351 #else
347 @$(RM) $@ 352 @$(RM) $@
348 ${dump_temacs} 353 ${dump_temacs}
349 @echo "Testing for Lisp shadows ..." 354 @echo "Testing for Lisp shadows ..."
686 sunplay.o: ${srcdir}/sunplay.c 691 sunplay.o: ${srcdir}/sunplay.c
687 $(CC) -c $(sound_cflags) $(cflags) ${srcdir}/sunplay.c 692 $(CC) -c $(sound_cflags) $(cflags) ${srcdir}/sunplay.c
688 hpplay.o: ${srcdir}/hpplay.c 693 hpplay.o: ${srcdir}/hpplay.c
689 $(CC) -c -Demacs $(sound_cflags) $(cflags) ${srcdir}/hpplay.c 694 $(CC) -c -Demacs $(sound_cflags) $(cflags) ${srcdir}/hpplay.c
690 #endif /* HAVE_NATIVE_SOUND */ 695 #endif /* HAVE_NATIVE_SOUND */
696
697 xemacs_res.o: ${srcdir}/../nt/xemacs.rc
698 windres --include-dir ${srcdir}/../nt -i ${srcdir}/../nt/xemacs.rc -o $@
691 699
692 ## System-specific programs to be made. 700 ## System-specific programs to be made.
693 ## ${other_files}, $(objects_system) and $(objects_machine) 701 ## ${other_files}, $(objects_system) and $(objects_machine)
694 ## select which of these should be compiled. */ 702 ## select which of these should be compiled. */
695 703