Simplify makefile

[Dimitrie O. Paun]

Well,

Why not stop beating around the bush, and just put all
resources into the same file. We really gain nothing
from having them in different files (other than
complexity).

This one requires the following:

    $ cd dlls/user/resources
    $ cat user32_{bitmaps,cursors,icons}.rc > user32_bin.rc
    $ cvs rm -f user32_{bitmaps,cursors,icons}.rc
    $ cvs add user32_bin.rc

ChangeLog
    Merge all binary resources for user32 in one file.

Index: dlls/user/Makefile.in
===================================================================
RCS file: /var/cvs/wine/dlls/user/Makefile.in,v
retrieving revision 1.74
diff -u -r1.74 Makefile.in
--- dlls/user/Makefile.in	3 Oct 2003 05:01:33 -0000	1.74
+++ dlls/user/Makefile.in	3 Oct 2003 06:41:53 -0000
@@ -93,6 +93,8 @@
 
 RC_SRCS = resources/user32.rc
 
+RC_BINSRC = resources/user32_bin.rc
+
 RC_BMPS = \
 	resources/obm_btncorners.bmp \
 	resources/obm_btsize.bmp \
@@ -157,6 +159,8 @@
 	resources/oic_sample.ico \
 	resources/oic_winlogo.ico
 
+RC_BINARIES = $(RC_BMPS) $(RC_CURS) $(RC_ICOS)
+
 RC_SRCS16 = \
 	resources/display.rc \
 	resources/mouse.rc \
@@ -191,21 +195,5 @@
 
 resources/version16.res: resources/version16.rc
 	$(LDPATH) $(RC16) $(RC16FLAGS) -fo$@ $(SRCDIR)/resources/version16.rc
-
-$(RC_BMPS): resources/user32_bitmaps.rc
-	$(BIN2RES) -f -o $@ $(SRCDIR)/resources/user32_bitmaps.rc
-
-$(RC_CURS): resources/user32_cursors.rc
-	$(BIN2RES) -f -o $@ $(SRCDIR)/resources/user32_cursors.rc
-
-$(RC_ICOS): resources/user32_icons.rc
-	$(BIN2RES) -f -o $@ $(SRCDIR)/resources/user32_icons.rc
-
-$(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res): $(RC_BMPS) $(RC_CURS) $(RC_ICOS)
-
-$(RC_BMPS) $(RC_CURS) $(RC_ICOS): $(BIN2RES)
-
-clean::
-	$(RM) $(RC_BMPS) $(RC_CURS) $(RC_ICOS)
 
 ### Dependencies:
Index: dlls/user/resources/user32.rc
===================================================================
RCS file: /var/cvs/wine/dlls/user/resources/user32.rc,v
retrieving revision 1.10
diff -u -r1.10 user32.rc
--- dlls/user/resources/user32.rc	5 Sep 2003 23:08:29 -0000	1.10
+++ dlls/user/resources/user32.rc	3 Oct 2003 06:45:03 -0000
@@ -34,9 +34,7 @@
  * neutral language. This will prevent them from
  * being duplicated for each language.
  */
-#include "resources/user32_bitmaps.rc"
-#include "resources/user32_cursors.rc"
-#include "resources/user32_icons.rc"
+#include "resources/user32_bin.rc"
 
 /*
  * Everything specific to any language goes


-- 
Dimi.