Alexandre Julliard : makefiles: Add resource files to the standard object files list.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 68a1f4d0a11914a2e509fa7d88c71b90637209fe
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=68a1f4d0a11914a2e509fa7d88...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Tue Jun  2 15:50:57 2009 +0200

makefiles: Add resource files to the standard object files list.

---

 Make.rules.in                 |    2 +-
 dlls/Makedll.rules.in         |    2 +-
 dlls/Maketest.rules.in        |    6 +++---
 programs/Makeprog.rules.in    |    4 ++--
 programs/winetest/Makefile.in |    2 +-
 programs/winetest/dist.rc     |    2 --
 6 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/Make.rules.in b/Make.rules.in
index 05cfa12..b1ccd7c 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -118,7 +118,7 @@ IDL_GEN_HEADERS = $(IDL_H_SRCS:.idl=.h) $(IDL_C_SRCS:.idl=.h) $(IDL_I_SRCS:.idl=
 CLEAN_TARGETS = $(IDL_GEN_C_SRCS) $(IDL_GEN_HEADERS) $(IDL_TLB_SRCS:.idl=.tlb) $(IDL_P_SRCS:%=dlldata.c) \
                 $(BISON_SRCS:.y=.tab.c) $(BISON_SRCS:.y=.tab.h) $(LEX_SRCS:.l=.yy.c) $(MC_SRCS:.mc=.mc.rc)
 
-OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o) $(EXTRA_OBJS)
+OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o) $(RC_SRCS:.rc=.res) $(EXTRA_OBJS)
 
 LINTS  = $(C_SRCS:.c=.ln)
 
diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in
index a571ae3..5a77d9e 100644
--- a/dlls/Makedll.rules.in
+++ b/dlls/Makedll.rules.in
@@ -16,7 +16,7 @@ BASEMODULE  = $(MODULE:%.dll=%)
 MAINSPEC    = $(BASEMODULE).spec
 SPEC_DEF    = $(BASEMODULE).def
 WIN16_FILES = $(SPEC_SRCS16:.spec=.spec.o) $(C_SRCS16:.c=.o) $(EXTRA_OBJS16)
-ALL_OBJS    = @WIN16_FILES@ $(OBJS) $(RC_SRCS:.rc=.res)
+ALL_OBJS    = @WIN16_FILES@ $(OBJS)
 ALL_LIBS    = $(LIBPORT) $(EXTRALIBS) $(LDFLAGS) $(LIBS)
 IMPLIB_OBJS = $(IMPLIB_SRCS:.c=.o)
 IMPORTLIBFILE = $(IMPORTLIB:%=lib%.(a)IMPLIBEXT@)
diff --git a/dlls/Maketest.rules.in b/dlls/Maketest.rules.in
index 0ff50d9..b112c45 100644
--- a/dlls/Maketest.rules.in
+++ b/dlls/Maketest.rules.in
@@ -29,8 +29,8 @@ CROSSWINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc @CROSSTARGETFLAGS@ -B$(TOOLSDIR
 
 all: $(TESTPROGRAM)
 
-$(MODULE) $(MODULE).so: $(OBJS) $(RC_SRCS:.rc=.res) Makefile.in
-	$(WINEGCC) $(APPMODE) $(OBJS) $(RC_SRCS:.rc=.res) -o $@ $(LIBPORT) $(ALL_LIBS)
+$(MODULE) $(MODULE).so: $(OBJS) Makefile.in
+	$(WINEGCC) $(APPMODE) $(OBJS) -o $@ $(LIBPORT) $(ALL_LIBS)
 
 # Rules for building test list
 
@@ -47,7 +47,7 @@ $(TESTRESULTS): $(MODULE)$(DLLEXT) ../$(TESTDLL)$(DLLEXT)
 
 # Rules for cross-compiling tests
 
-CROSSOBJS = $(OBJS:.o=.cross.o) $(RC_SRCS:.rc=.res)
+CROSSOBJS = $(OBJS:.o=.cross.o)
 
 .SUFFIXES: .cross.o
 
diff --git a/programs/Makeprog.rules.in b/programs/Makeprog.rules.in
index 7c47727..9c361ff 100644
--- a/programs/Makeprog.rules.in
+++ b/programs/Makeprog.rules.in
@@ -19,8 +19,8 @@ INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(dlldir) $(DESTDIR)$(mandir)/man$(p
 
 all: $(MODULE)$(DLLEXT)
 
-$(MODULE) $(MODULE).so: $(OBJS) $(RC_SRCS:.rc=.res) Makefile.in
-	$(WINEGCC) $(APPMODE) $(OBJS) $(RC_SRCS:.rc=.res) -o $@ $(ALL_LIBS) $(DELAYIMPORTS:%=-Wb,-d%)
+$(MODULE) $(MODULE).so: $(OBJS) Makefile.in
+	$(WINEGCC) $(APPMODE) $(OBJS) -o $@ $(ALL_LIBS) $(DELAYIMPORTS:%=-Wb,-d%)
 
 # Rules for testing
 
diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in
index bb1ff86..bd1251f 100644
--- a/programs/winetest/Makefile.in
+++ b/programs/winetest/Makefile.in
@@ -50,7 +50,7 @@ winetest-dist.exe winetest-dist.exe.so: $(OBJS) dist.res Makefile.in
 	$(WINEGCC) $(APPMODE) $(OBJS) dist.res -o $@ -L$(DLLDIR) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS)
 	-upx -9 -qqq $@
 
-dist.res: winetest.rc tests.rc build.nfo winetest.ico $(TESTBINS)
+dist.res: build.nfo
 
 @DEPENDENCIES@  # everything below this line is overwritten by make depend
 
diff --git a/programs/winetest/dist.rc b/programs/winetest/dist.rc
index 4acbfa6..6e3ac6c 100644
--- a/programs/winetest/dist.rc
+++ b/programs/winetest/dist.rc
@@ -18,7 +18,5 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "winetest.rc"
-
 /* @makedep: build.nfo */
 BUILD_INFO STRINGRES "build.nfo"