Alexandre Julliard : makefiles: Remove special handling of .res. o files now that winegcc takes care of this.

[Alexandre Julliard]

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

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Tue Jun  2 13:31:22 2009 +0200

makefiles: Remove special handling of .res.o files now that winegcc takes care of this.

---

 Make.rules.in                 |    7 +---
 configure                     |   93 -----------------------------------------
 configure.ac                  |    1 -
 dlls/Makedll.rules.in         |    9 +----
 dlls/Maketest.rules.in        |   11 +----
 programs/Makeprog.rules.in    |    9 +----
 programs/winetest/Makefile.in |    5 +--
 7 files changed, 6 insertions(+), 129 deletions(-)

diff --git a/Make.rules.in b/Make.rules.in
index a259da9..05cfa12 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -40,7 +40,6 @@ AR        = @AR@
 ARFLAGS   = @ARFLAGS@
 RANLIB    = @RANLIB@
 STRIP     = @STRIP@
-WINDRES   = @WINDRES@
 LN        = @LN@
 LN_S      = @LN_S@
 TOOLSDIR  = @TOOLSDIR@
@@ -121,7 +120,6 @@ CLEAN_TARGETS = $(IDL_GEN_C_SRCS) $(IDL_GEN_HEADERS) $(IDL_TLB_SRCS:.idl=.tlb) $
 
 OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o) $(EXTRA_OBJS)
 
-RCOBJS = $(RC_SRCS:.rc=.res.o)
 LINTS  = $(C_SRCS:.c=.ln)
 
 # 'all' target first in case the enclosing Makefile didn't define any target
@@ -135,7 +133,7 @@ filter: dummy
 
 # Implicit rules
 
-.SUFFIXES: .mc .rc .mc.rc .res .res.o .spec .spec.o .idl .tlb .h .y .l .tab.c .tab.h .yy.c .ok .man.in .man _c.c _i.c _p.c _s.c @MAINTAINER_MODE@ .sfd .ttf .svg .ico
+.SUFFIXES: .mc .rc .mc.rc .res .spec .spec.o .idl .tlb .h .y .l .tab.c .tab.h .yy.c .ok .man.in .man _c.c _i.c _p.c _s.c @MAINTAINER_MODE@ .sfd .ttf .svg .ico
 
 .c.o:
 	$(CC) -c $(ALLCFLAGS) -o $@ $<
@@ -155,9 +153,6 @@ filter: dummy
 .rc.res:
 	$(LDPATH) $(RC) $(RCFLAGS) -fo$@ $<
 
-.res.res.o:
-	$(WINDRES) -i $< -o $@
-
 .spec.spec.o:
 	$(WINEBUILD) $(WINEBUILDFLAGS) --dll -o $@ --main-module $(MODULE) --export $<
 
diff --git a/configure b/configure
index 4ed22e0..35fb4ac 100755
--- a/configure
+++ b/configure
@@ -733,7 +733,6 @@ EGREP
 GREP
 LN
 LN_S
-WINDRES
 STRIP
 RANLIB
 ARFLAGS
@@ -4345,98 +4344,6 @@ else
   STRIP="$ac_cv_prog_STRIP"
 fi
 
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
-set dummy ${ac_tool_prefix}windres; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_WINDRES+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$WINDRES"; then
-  ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_WINDRES="${ac_tool_prefix}windres"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-WINDRES=$ac_cv_prog_WINDRES
-if test -n "$WINDRES"; then
-  { $as_echo "$as_me:$LINENO: result: $WINDRES" >&5
-$as_echo "$WINDRES" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_WINDRES"; then
-  ac_ct_WINDRES=$WINDRES
-  # Extract the first word of "windres", so it can be a program name with args.
-set dummy windres; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_WINDRES"; then
-  ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_WINDRES="windres"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES
-if test -n "$ac_ct_WINDRES"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5
-$as_echo "$ac_ct_WINDRES" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_WINDRES" = x; then
-    WINDRES="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    WINDRES=$ac_ct_WINDRES
-  fi
-else
-  WINDRES="$ac_cv_prog_WINDRES"
-fi
-
 { $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
 $as_echo_n "checking whether ln -s works... " >&6; }
 LN_S=$as_ln_s
diff --git a/configure.ac b/configure.ac
index 2185331..9fc8936 100644
--- a/configure.ac
+++ b/configure.ac
@@ -203,7 +203,6 @@ AC_CHECK_TOOLS(AR,[ar gar],ar)
 AC_SUBST(ARFLAGS,rc)
 AC_PROG_RANLIB
 AC_CHECK_TOOL(STRIP,strip,strip)
-AC_CHECK_TOOL(WINDRES,windres,false)
 AC_PROG_LN_S
 WINE_PROG_LN
 AC_PROG_EGREP
diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in
index 29ee76a..a571ae3 100644
--- a/dlls/Makedll.rules.in
+++ b/dlls/Makedll.rules.in
@@ -28,16 +28,9 @@ all: $(MODULE)$(DLLEXT) $(SUBDIRS)
 
 @MAKE_RULES@
 
-# Rules for .so files
-
-$(MODULE).so: $(MAINSPEC) $(ALL_OBJS) Makefile.in
+$(MODULE) $(MODULE).so: $(MAINSPEC) $(ALL_OBJS) Makefile.in
 	$(WINEGCC) -shared $(SRCDIR)/$(MAINSPEC) $(ALL_OBJS) $(EXTRADLLFLAGS) -o $@ $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS)
 
-# Rules for .dll files
-
-$(MODULE): $(MAINSPEC) $(RCOBJS) $(OBJS) Makefile.in
-	$(WINEGCC) -shared $(SRCDIR)/$(MAINSPEC) $(OBJS) $(RCOBJS) $(EXTRADLLFLAGS) -o $@ $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(ALL_LIBS)
-
 # Rules for import libraries
 
 .PHONY: implib $(IMPLIB_SRCS:%=__static_implib__%)
diff --git a/dlls/Maketest.rules.in b/dlls/Maketest.rules.in
index 58bd3a3..7ea8372 100644
--- a/dlls/Maketest.rules.in
+++ b/dlls/Maketest.rules.in
@@ -30,15 +30,8 @@ CROSSWINDRES = @CROSSWINDRES@
 
 all: $(TESTPROGRAM)
 
-# Rules for .so main module
-
-$(MODULE).so: $(OBJS) $(RC_SRCS:.rc=.res) Makefile.in
-	$(WINEGCC) -mconsole $(APPMODE) $(OBJS) $(RC_SRCS:.rc=.res) -o $@ $(LIBPORT) $(ALL_LIBS)
-
-# Rules for .exe main module
-
-$(MODULE): $(OBJS) $(RCOBJS) Makefile.in
-	$(WINEGCC) $(APPMODE) $(OBJS) $(RCOBJS) -o $@ $(LIBPORT) $(ALL_LIBS)
+$(MODULE) $(MODULE).so: $(OBJS) $(RC_SRCS:.rc=.res) Makefile.in
+	$(WINEGCC) $(APPMODE) $(OBJS) $(RC_SRCS:.rc=.res) -o $@ $(LIBPORT) $(ALL_LIBS)
 
 # Rules for building test list
 
diff --git a/programs/Makeprog.rules.in b/programs/Makeprog.rules.in
index 95772f3..7c47727 100644
--- a/programs/Makeprog.rules.in
+++ b/programs/Makeprog.rules.in
@@ -19,16 +19,9 @@ INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(dlldir) $(DESTDIR)$(mandir)/man$(p
 
 all: $(MODULE)$(DLLEXT)
 
-# Rules for .so main module
-
-$(MODULE).so: $(OBJS) $(RC_SRCS:.rc=.res) Makefile.in
+$(MODULE) $(MODULE).so: $(OBJS) $(RC_SRCS:.rc=.res) Makefile.in
 	$(WINEGCC) $(APPMODE) $(OBJS) $(RC_SRCS:.rc=.res) -o $@ $(ALL_LIBS) $(DELAYIMPORTS:%=-Wb,-d%)
 
-# Rules for .exe main module
-
-$(MODULE): $(OBJS) $(RCOBJS) Makefile.in
-	$(WINEGCC) $(APPMODE) $(OBJS) $(RCOBJS) -o $@ $(ALL_LIBS) $(DELAYIMPORTS:%=-Wb,-d%)
-
 # Rules for testing
 
 check test:: $(SUBDIRS:%=%/__test__) dummy
diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in
index d880cab..bb1ff86 100644
--- a/programs/winetest/Makefile.in
+++ b/programs/winetest/Makefile.in
@@ -46,11 +46,8 @@ depend: tests.rc
 
 dist: winetest-dist.exe$(DLLEXT)
 
-winetest-dist.exe.so: $(OBJS) dist.res Makefile.in
+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)
-
-winetest-dist.exe: $(OBJS) dist.res.o Makefile.in
-	$(WINEGCC) $(APPMODE) $(OBJS) dist.res.o -o $@ -L$(DLLDIR) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS)
 	-upx -9 -qqq $@
 
 dist.res: winetest.rc tests.rc build.nfo winetest.ico $(TESTBINS)