diff 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
line wrap: on
line diff
--- a/src/Makefile.in.in	Mon Aug 13 11:18:12 2007 +0200
+++ b/src/Makefile.in.in	Mon Aug 13 11:19:21 2007 +0200
@@ -138,6 +138,10 @@
 sheap_obj=sheap.o
 #endif
 
+#if defined(MINGW) || defined(CYGWIN)
+res_obj=xemacs_res.o
+#endif
+
 ## -Demacs is needed to make some files produce the correct version
 ## for use in Emacs.
 
@@ -191,7 +195,7 @@
  rangetab.o redisplay.o redisplay-output.o regex.o\
  search.o select.o $(sheap_obj) signal.o sound.o\
  specifier.o strftime.o symbols.o syntax.o sysdep.o\
- undo.o $(x_objs) widget.o window.o
+ undo.o $(x_objs) widget.o window.o $(res_obj)
 
 obj_rtl = $(objs:.o=.c.rtl)
 
@@ -342,6 +346,7 @@
 		./${PROGNAME} -batch -vanilla -f list-load-path-shadows; fi; \
 		$(RM) SATISFIED; exit 0; fi; \
 	if test -f SATISFIED; then $(RM) SATISFIED; exit 1; fi; \
+	@$(RM) $@; \
 	$(RECURSIVE_MAKE) $@;
 #else
 	@$(RM) $@
@@ -689,6 +694,9 @@
 	$(CC) -c -Demacs $(sound_cflags) $(cflags) ${srcdir}/hpplay.c
 #endif /* HAVE_NATIVE_SOUND */
 
+xemacs_res.o: ${srcdir}/../nt/xemacs.rc
+	windres --include-dir ${srcdir}/../nt -i ${srcdir}/../nt/xemacs.rc -o $@
+
 ## System-specific programs to be made.
 ## ${other_files}, $(objects_system) and $(objects_machine)
 ## select which of these should be compiled.  */