Eric Pouech <[EMAIL PROTECTED]> writes:
> however, we use the same SUBDIRS macros for the last both
> as a result, the recent debug channel modification lets have in winmm the debug
> channels for all the modules winmm/mmsystem may use
> of course it's not a big deal (a few bytes added to the file), but I still
> think it's worth cleaning up the SUBDIRS stuff
winmm is broken, it should not define SUBDIRS at all. SUBDIRS is the
list of directories that contain parts of the current dll, plus a
Makefile to build them. In cases where there is no Makefile (like
ddraw) we use EXTRASUBDIRS instead. Subdirs that contain other dlls
(like winmm) must be handled directly in dlls/Makefile, we shouldn't
have dlls build other dlls.
The right fix should be something like this:
Index: dlls/Makefile.in
===================================================================
RCS file: /opt/cvs-commit/wine/dlls/Makefile.in,v
retrieving revision 1.72
diff -u -r1.72 Makefile.in
--- dlls/Makefile.in 2000/11/05 04:53:07 1.72
+++ dlls/Makefile.in 2000/11/06 19:07:55
@@ -170,6 +170,15 @@
wineps \
wininet \
winmm \
+ winmm/joystick \
+ winmm/mcianim \
+ winmm/mciavi \
+ winmm/mcicda \
+ winmm/mciseq \
+ winmm/mciwave \
+ winmm/midimap \
+ winmm/wavemap \
+ winmm/wineoss \
winsock \
winspool \
wow32 \
Index: dlls/winmm/Makefile.in
===================================================================
RCS file: /opt/cvs-commit/wine/dlls/winmm/Makefile.in,v
retrieving revision 1.15
diff -u -r1.15 Makefile.in
--- dlls/winmm/Makefile.in 2000/11/05 04:53:17 1.15
+++ dlls/winmm/Makefile.in 2000/11/06 19:07:56
@@ -23,17 +23,6 @@
RC_SRCS= \
winmm_res.rc
-SUBDIRS = \
- joystick \
- mcianim \
- mciavi \
- mcicda \
- mciseq \
- mciwave \
- midimap \
- wavemap \
- wineoss
-
@MAKE_DLL_RULES@
### Dependencies:
--
Alexandre Julliard
[EMAIL PROTECTED]
