From d0edc5fecd4069f9424be3021479e05f2ac0fbb8 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Sat, 4 Mar 2000 22:31:27 +0000 Subject: [PATCH] Moved dll-specific make rules to a separate Makedll.rules file. --- Make.rules.in | 53 ++++------------------------------- Makefile.in | 30 ++++++++++++++++++-- configure | 7 +++++ configure.in | 4 +++ dlls/.cvsignore | 1 + dlls/Makedll.rules.in | 61 +++++++++++++++++++++++++++++++++++++++++ dlls/advapi32/Makefile.in | 2 -- dlls/avifil32/Makefile.in | 9 +----- dlls/comctl32/Makefile.in | 11 ++------ dlls/commdlg/Makefile.in | 11 ++------ dlls/dciman32/Makefile.in | 9 +----- dlls/display/Makefile.in | 2 -- dlls/dplayx/Makefile.in | 8 +----- dlls/dsound/Makefile.in | 9 +----- dlls/icmp/Makefile.in | 9 +----- dlls/imagehlp/Makefile.in | 9 +----- dlls/imm32/Makefile.in | 9 +----- dlls/lzexpand/Makefile.in | 9 +----- dlls/mouse/Makefile.in | 2 -- dlls/msacm/Makefile.in | 9 +----- dlls/msacm32/Makefile.in | 9 +----- dlls/msnet32/Makefile.in | 9 +----- dlls/msvideo/Makefile.in | 9 +----- dlls/odbc32/Makefile.in | 9 +----- dlls/ole32/Makefile.in | 9 +----- dlls/oleaut32/Makefile.in | 9 +----- dlls/olecli/Makefile.in | 9 +----- dlls/oledlg/Makefile.in | 9 +----- dlls/olepro32/Makefile.in | 9 +----- dlls/olesvr/Makefile.in | 9 +----- dlls/psapi/Makefile.in | 9 +----- dlls/rasapi32/Makefile.in | 9 +----- dlls/setupx/Makefile.in | 9 +----- dlls/shell32/Makefile.in | 14 ++-------- dlls/sound/Makefile.in | 9 +----- dlls/stress/Makefile.in | 9 +----- dlls/tapi32/Makefile.in | 9 +----- dlls/version/Makefile.in | 9 +----- dlls/win32s/Makefile.in | 9 +----- dlls/win87em/Makefile.in | 9 +----- dlls/windebug/Makefile.in | 9 +----- dlls/wing/Makefile.in | 9 +----- dlls/winmm/Makefile.in | 15 +++------- dlls/winmm/joystick/Makefile.in | 9 +----- dlls/winmm/mcianim/Makefile.in | 9 +----- dlls/winmm/mciavi/Makefile.in | 9 +----- dlls/winmm/mcicda/Makefile.in | 9 +----- dlls/winmm/mciseq/Makefile.in | 9 +----- dlls/winmm/mciwave/Makefile.in | 9 +----- dlls/winmm/midimap/Makefile.in | 9 +----- dlls/winmm/wavemap/Makefile.in | 9 +----- dlls/winmm/wineoss/Makefile.in | 9 +----- dlls/winsock/Makefile.in | 9 +----- dlls/winspool/Makefile.in | 9 +----- dlls/wnaspi32/Makefile.in | 9 +----- resources/Makefile.in | 2 -- 56 files changed, 159 insertions(+), 433 deletions(-) create mode 100644 dlls/Makedll.rules.in diff --git a/Make.rules.in b/Make.rules.in index e8351aef4a3..a6c0b563338 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -36,14 +36,11 @@ LN_S = @LN_S@ DIVINCL = -I$(SRCDIR) -I. -I$(TOPSRCDIR)/include -I$(TOPOBJDIR)/include ALLCFLAGS = $(DIVINCL) $(CFLAGS) $(DEFS) $(OPTIONS) $(X_CFLAGS) LDCOMBINE = ld -r -SONAME = lib$(MODULE).so -LDSHARED = @LDSHARED@ AR = ar rc RM = rm -f MV = mv MKDIR = mkdir -p C2MAN = @C2MAN@ -LDCONFIG = @LDCONFIG@ MANSPECS = -w $(TOPSRCDIR)/relay32/gdi32.spec \ -w $(TOPSRCDIR)/relay32/user32.spec \ -w $(TOPSRCDIR)/relay32/comctl32.spec \ @@ -174,6 +171,10 @@ DLLS = \ .PHONY: all install uninstall clean distclean depend dummy +# 'all' target first in case the enclosing Makefile didn't define any target + +all: Makefile + # Rule to rebuild the resource compiler $(WRC) check_wrc: @@ -199,56 +200,12 @@ $(WINESTUB) check_winestub: $(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in $(LDCOMBINE) $(OBJS) -o $(MODULE).o -lib$(MODULE).so.$(SOVERSION): $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in - $(LDSHARED) $(OBJS) -o $@ - -lib$(MODULE).so: lib$(MODULE).so.$(SOVERSION) - $(RM) $@ - $(LN_S) lib$(MODULE).so.$(SOVERSION) $@ - -lib$(MODULE).a: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in - $(RM) $@ - $(AR) $@ $(OBJS) - $(RANLIB) $@ - # Rules for makefile Makefile: Makefile.in $(TOPSRCDIR)/configure @echo Makefile is older than $?, please rerun $(TOPSRCDIR)/configure @exit 1 -all: Makefile - -# Rules for checking that no imports are missing - -IMPORTLIBS = $(IMPORTS:%=$(DLLDIR)/lib%.$(LIBEXT)) - -checklink_so checklink_a: lib$(MODULE).$(LIBEXT) $(IMPORTLIBS) - $(CC) -o checklink $(TOPSRCDIR)/library/checklink.c -L. -l$(MODULE) -L$(DLLDIR) $(IMPORTS:%=-l%) -L$(TOPOBJDIR) -lwine $(LDOPTIONS) $(X_LIBS) $(XLIB) $(LIBS) && $(RM) checklink - -checklink:: $(LIBEXT:%=checklink_%) - -$(IMPORTLIBS): dummy - @cd $(DLLDIR) && $(MAKE) `basename $@` - -# Rules for installation - -install_so: lib$(MODULE).so.$(SOVERSION) - [ -d $(libdir) ] || $(MKDIR) $(libdir) - $(INSTALL_PROGRAM) lib$(MODULE).so.$(SOVERSION) $(libdir)/lib$(MODULE).so.$(SOVERSION) - cd $(libdir) && $(RM) lib$(MODULE).so && $(LN_S) lib$(MODULE).so.$(SOVERSION) lib$(MODULE).so - -install_a: lib$(MODULE).a - [ -d $(libdir) ] || $(MKDIR) $(libdir) - $(INSTALL_DATA) lib$(MODULE).a $(libdir)/lib$(MODULE).a - -uninstall_so uninstall_a: - cd $(libdir) && $(RM) lib$(MODULE).so lib$(MODULE).so.$(SOVERSION) lib$(MODULE).a - -install:: $(LIBEXT:%=install_%) - -uninstall:: $(LIBEXT:%=uninstall_%) - # Rules for auto documentation man: $(C_SRCS) @@ -281,6 +238,8 @@ $(SPEC_SRCS:.spec=.spec.c): $(BUILD) $(TOPSRCDIR)/include/builtin16.h $(TOPSRCDI $(GLUE:.c=.glue.c): $(BUILD) $(TOPSRCDIR)/include/builtin16.h $(TOPSRCDIR)/include/builtin32.h +$(RC_SRCS:.rc=.s): $(WRC) + depend:: $(MAKEDEP) $(C_SRCS) $(RC_SRCS) $(EXTRA_SRCS) $(MAKEDEP) $(DIVINCL) -C$(SRCDIR) $(C_SRCS) $(RC_SRCS) $(EXTRA_SRCS) diff --git a/Makefile.in b/Makefile.in index 6fac5bec2e8..3eef1b49fd4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -17,8 +17,11 @@ TOPOBJDIR = . SRCDIR = @srcdir@ VPATH = @srcdir@ LIBEXT = @LIBEXT@ +LDSHARED = @LDSHARED@ +LDCONFIG = @LDCONFIG@ MODULE = wine SOVERSION = 1.0 +SONAME = libwine.so TOOLSUBDIRS = \ tools \ @@ -176,13 +179,22 @@ wine wine.sym: lib$(MODULE).$(LIBEXT) $(DLLOBJS) $(EMUOBJS) llib-lwine.ln : $(LIBLINTS) $(X11LINTS) $(LINT) $(ALLLINTFLAGS) -owine $(LIBLINTS) $(X11LINTS) +install_so: lib$(MODULE).so.$(SOVERSION) + [ -d $(libdir) ] || $(MKDIR) $(libdir) + $(INSTALL_PROGRAM) lib$(MODULE).so.$(SOVERSION) $(libdir)/lib$(MODULE).so.$(SOVERSION) + cd $(libdir) && $(RM) lib$(MODULE).so && $(LN_S) lib$(MODULE).so.$(SOVERSION) lib$(MODULE).so + +install_a: lib$(MODULE).a + [ -d $(libdir) ] || $(MKDIR) $(libdir) + $(INSTALL_DATA) lib$(MODULE).a $(libdir)/lib$(MODULE).a + install_wine: wine [ -d $(bindir) ] || $(MKDIR) $(bindir) [ -d $(libdir) ] || $(MKDIR) $(libdir) [ -f wine.sym ] && $(INSTALL_DATA) wine.sym $(libdir)/wine.sym $(INSTALL_PROGRAM) wine $(bindir)/wine -install:: $(PROGRAMS) $(EMU_TARGET:%=install_%) +install:: $(PROGRAMS) $(EMU_TARGET:%=install_%) $(LIBEXT:%=install_%) [ -d $(bindir) ] || $(MKDIR) $(bindir) $(INSTALL_PROGRAM) server/wineserver $(bindir)/wineserver $(INSTALL_PROGRAM) windows/x11drv/wineclipsrv $(bindir)/wineclipsrv @@ -192,6 +204,20 @@ uninstall:: cd $(libdir) && $(RM) libwine.a libwine.so libwine.so.$(SOVERSION) wine.sym cd $(bindir) && $(RM) wine wineserver wineclipsrv dosmod +lib$(MODULE).so.$(SOVERSION): $(OBJS) Makefile.in Make.rules.in + $(LDSHARED) $(OBJS) -o $@ + +lib$(MODULE).so: lib$(MODULE).so.$(SOVERSION) + $(RM) $@ && $(LN_S) lib$(MODULE).so.$(SOVERSION) $@ + +lib$(MODULE).a: $(OBJS) Makefile.in Make.rules.in + $(RM) $@ + $(AR) $@ $(OBJS) + $(RANLIB) $@ + +checklink:: + $(CC) -o checklink $(TOPSRCDIR)/library/checklink.c -L. -lwine $(LDOPTIONS) $(X_LIBS) $(XLIB) $(LIBS) && $(RM) checklink + $(X11OBJS) $(EMUOBJS) $(LIBOBJS) $(DLLOBJS) $(PROGRAMS): $(TOOLSUBDIRS) dummy @cd `dirname $@` && $(MAKE) `basename $@` @@ -237,7 +263,7 @@ clean:: $(RM) wine wine.sym libwine.so.1.0 TAGS .#* distclean: clean - $(RM) config.* Make.rules include/config.h documentation/wine.man documentation/wine.conf.man + $(RM) config.* Make.rules dlls/Makedll.rules include/config.h documentation/wine.man documentation/wine.conf.man $(RM) `find . \( -name Makefile -o -size 0 \) -print` # We depend on configure above for checks, so we better don't use this rule. diff --git a/configure b/configure index f93bf2dd1ed..ab5252c8b26 100755 --- a/configure +++ b/configure @@ -6067,6 +6067,9 @@ fi MAKE_RULES=Make.rules +MAKE_DLL_RULES=dlls/Makedll.rules + + trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -6174,6 +6177,7 @@ Makefile console/Makefile controls/Makefile debugger/Makefile +dlls/Makedll.rules dlls/Makefile dlls/advapi32/Makefile dlls/avifil32/Makefile @@ -6341,6 +6345,8 @@ s%@ALLOCA@%$ALLOCA%g s%@GCC_NO_BUILTIN@%$GCC_NO_BUILTIN%g /@MAKE_RULES@/r $MAKE_RULES s%@MAKE_RULES@%%g +/@MAKE_DLL_RULES@/r $MAKE_DLL_RULES +s%@MAKE_DLL_RULES@%%g CEOF EOF @@ -6387,6 +6393,7 @@ Makefile console/Makefile controls/Makefile debugger/Makefile +dlls/Makedll.rules dlls/Makefile dlls/advapi32/Makefile dlls/avifil32/Makefile diff --git a/configure.in b/configure.in index a92e01a9f1b..fa08d8fd239 100644 --- a/configure.in +++ b/configure.in @@ -930,12 +930,16 @@ dnl **** Generate output files **** MAKE_RULES=Make.rules AC_SUBST_FILE(MAKE_RULES) +MAKE_DLL_RULES=dlls/Makedll.rules +AC_SUBST_FILE(MAKE_DLL_RULES) + AC_OUTPUT([ Make.rules Makefile console/Makefile controls/Makefile debugger/Makefile +dlls/Makedll.rules dlls/Makefile dlls/advapi32/Makefile dlls/avifil32/Makefile diff --git a/dlls/.cvsignore b/dlls/.cvsignore index f3c7a7c5da6..4ea3f0a7af5 100644 --- a/dlls/.cvsignore +++ b/dlls/.cvsignore @@ -1 +1,2 @@ +Makedll.rules Makefile diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in new file mode 100644 index 00000000000..d0ee5d5399f --- /dev/null +++ b/dlls/Makedll.rules.in @@ -0,0 +1,61 @@ +# Global rules for building dlls -*-Makefile-*- +# +# Each individual makefile should define the following variables: +# MODULE : name of the main module being built +# SOVERSION : version of the .so file +# IMPORTS : dlls to import (optional) +# +# plus all variables required by the global Make.rules.in +# + +DEFS = @DLLFLAGS@ -D__WINE__ +LIBEXT = @LIBEXT@ +LDSHARED = @LDSHARED@ +SONAME = lib$(MODULE).so +IMPORTLIBS = $(IMPORTS:%=$(DLLDIR)/lib%.$(LIBEXT)) + +all: lib$(MODULE).$(LIBEXT) + +@MAKE_RULES@ + +lib$(MODULE).so.$(SOVERSION): $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in + $(LDSHARED) $(OBJS) -o $@ + +lib$(MODULE).so: lib$(MODULE).so.$(SOVERSION) + $(RM) $@ && $(LN_S) lib$(MODULE).so.$(SOVERSION) $@ + +lib$(MODULE).a: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in + $(RM) $@ + $(AR) $@ $(OBJS) + $(RANLIB) $@ + +# Rules for checking that no imports are missing + +IMPORTLIBS = $(IMPORTS:%=$(DLLDIR)/lib%.$(LIBEXT)) + +checklink:: lib$(MODULE).$(LIBEXT) $(IMPORTLIBS) + $(CC) -o checklink $(TOPSRCDIR)/library/checklink.c -L. -l$(MODULE) -L$(DLLDIR) $(IMPORTS:%=-l%) -L$(TOPOBJDIR) -lwine $(LDOPTIONS) $(X_LIBS) $(XLIB) $(LIBS) && $(RM) checklink + +$(IMPORTLIBS): dummy + @cd $(DLLDIR) && $(MAKE) `basename $@` + +# Rules for installation + +.PHONY: install_so install_a + +install_so: lib$(MODULE).so.$(SOVERSION) + [ -d $(libdir) ] || $(MKDIR) $(libdir) + $(INSTALL_PROGRAM) lib$(MODULE).so.$(SOVERSION) $(libdir)/lib$(MODULE).so.$(SOVERSION) + cd $(libdir) && $(RM) lib$(MODULE).so && $(LN_S) lib$(MODULE).so.$(SOVERSION) lib$(MODULE).so + +install_a: lib$(MODULE).a + [ -d $(libdir) ] || $(MKDIR) $(libdir) + $(INSTALL_DATA) lib$(MODULE).a $(libdir)/lib$(MODULE).a + +install:: $(LIBEXT:%=install_%) + +uninstall:: + cd $(libdir) && $(RM) lib$(MODULE).so lib$(MODULE).so.$(SOVERSION) lib$(MODULE).a + +clean:: + $(RM) lib$(MODULE).so.$(SOVERSION) diff --git a/dlls/advapi32/Makefile.in b/dlls/advapi32/Makefile.in index 20788d0912b..3082100089b 100644 --- a/dlls/advapi32/Makefile.in +++ b/dlls/advapi32/Makefile.in @@ -19,7 +19,5 @@ all: check_wrc $(MODULE).o @MAKE_RULES@ -$(RC_SRCS:.rc=.s): $(WRC) - ### Dependencies: diff --git a/dlls/avifil32/Makefile.in b/dlls/avifil32/Makefile.in index 916b0bb3a61..0ed9b8ac5ea 100644 --- a/dlls/avifil32/Makefile.in +++ b/dlls/avifil32/Makefile.in @@ -1,9 +1,7 @@ -DEFS = @DLLFLAGS@ -D__WINE__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -LIBEXT = @LIBEXT@ MODULE = avifil32 SOVERSION = 1.0 IMPORTS = msvfw32 winmm @@ -13,12 +11,7 @@ SPEC_SRCS = avifil32.spec avifile.spec C_SRCS = \ avifile.c -all: lib$(MODULE).$(LIBEXT) - -@MAKE_RULES@ - -clean:: - $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) +@MAKE_DLL_RULES@ ### Dependencies: diff --git a/dlls/comctl32/Makefile.in b/dlls/comctl32/Makefile.in index 664089d980e..37a685347c3 100644 --- a/dlls/comctl32/Makefile.in +++ b/dlls/comctl32/Makefile.in @@ -1,9 +1,7 @@ -DEFS = @DLLFLAGS@ -D__WINE__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -LIBEXT = @LIBEXT@ MODULE = comctl32 SOVERSION = 1.0 IMPORTS = winmm @@ -41,13 +39,8 @@ C_SRCS = \ RC_SRCS= \ rsrc.rc -all: check_wrc lib$(MODULE).$(LIBEXT) +@MAKE_DLL_RULES@ -@MAKE_RULES@ - -$(RC_SRCS:.rc=.s): $(WRC) - -clean:: - $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) +all: check_wrc ### Dependencies: diff --git a/dlls/commdlg/Makefile.in b/dlls/commdlg/Makefile.in index 8d912f5fbba..eb2f6ffb10f 100644 --- a/dlls/commdlg/Makefile.in +++ b/dlls/commdlg/Makefile.in @@ -1,9 +1,7 @@ -DEFS = @DLLFLAGS@ -D__WINE__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -LIBEXT = @LIBEXT@ MODULE = comdlg32 SOVERSION = 1.0 IMPORTS = shell32 ole32 comctl32 winspool winmm @@ -27,13 +25,8 @@ C_SRCS = \ RC_SRCS= \ rsrc.rc -all: check_wrc lib$(MODULE).$(LIBEXT) +@MAKE_DLL_RULES@ -@MAKE_RULES@ - -$(RC_SRCS:.rc=.s): $(WRC) - -clean:: - $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) +all: check_wrc ### Dependencies: diff --git a/dlls/dciman32/Makefile.in b/dlls/dciman32/Makefile.in index 3c50fb7f348..733127571a6 100644 --- a/dlls/dciman32/Makefile.in +++ b/dlls/dciman32/Makefile.in @@ -1,19 +1,12 @@ -DEFS = @DLLFLAGS@ -D__WINE__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -LIBEXT = @LIBEXT@ MODULE = dciman32 SOVERSION = 1.0 SPEC_SRCS = dciman32.spec -all: lib$(MODULE).$(LIBEXT) - -@MAKE_RULES@ - -clean:: - $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) +@MAKE_DLL_RULES@ ### Dependencies: diff --git a/dlls/display/Makefile.in b/dlls/display/Makefile.in index 48b355fa46d..74d5516b788 100644 --- a/dlls/display/Makefile.in +++ b/dlls/display/Makefile.in @@ -17,7 +17,5 @@ all: $(MODULE).o @MAKE_RULES@ -$(RC_SRCS:.rc=.s): $(WRC) - ### Dependencies: diff --git a/dlls/dplayx/Makefile.in b/dlls/dplayx/Makefile.in index e724bd7909f..58a1ca4802e 100644 --- a/dlls/dplayx/Makefile.in +++ b/dlls/dplayx/Makefile.in @@ -1,9 +1,7 @@ -DEFS = @DLLFLAGS@ -D__WINE__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -LIBEXT = @LIBEXT@ MODULE = dplayx SOVERSION = 1.0 IMPORTS = ole32 @@ -16,12 +14,8 @@ C_SRCS = dplay.c \ dplayx_main.c \ dplayx_global.c -all: lib$(MODULE).$(LIBEXT) -@MAKE_RULES@ - -clean:: - $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) +@MAKE_DLL_RULES@ ### Dependencies: diff --git a/dlls/dsound/Makefile.in b/dlls/dsound/Makefile.in index f3209a9e7b5..ebc52e3343b 100644 --- a/dlls/dsound/Makefile.in +++ b/dlls/dsound/Makefile.in @@ -1,9 +1,7 @@ -DEFS = @DLLFLAGS@ -D__WINE__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -LIBEXT = @LIBEXT@ MODULE = dsound SOVERSION = 1.0 @@ -13,12 +11,7 @@ SPEC_SRCS = \ C_SRCS = \ dsound_main.c -all: lib$(MODULE).$(LIBEXT) - -@MAKE_RULES@ - -clean:: - $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) +@MAKE_DLL_RULES@ ### Dependencies: diff --git a/dlls/icmp/Makefile.in b/dlls/icmp/Makefile.in index a7afaeea36f..16716f22372 100644 --- a/dlls/icmp/Makefile.in +++ b/dlls/icmp/Makefile.in @@ -1,9 +1,7 @@ -DEFS = @DLLFLAGS@ -D__WINE__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -LIBEXT = @LIBEXT@ MODULE = icmp SOVERSION = 1.0 @@ -11,12 +9,7 @@ SPEC_SRCS = icmp.spec C_SRCS = icmp_main.c -all: lib$(MODULE).$(LIBEXT) - -@MAKE_RULES@ - -clean:: - $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) +@MAKE_DLL_RULES@ ### Dependencies: diff --git a/dlls/imagehlp/Makefile.in b/dlls/imagehlp/Makefile.in index 15fd64850fc..05db3e6642c 100644 --- a/dlls/imagehlp/Makefile.in +++ b/dlls/imagehlp/Makefile.in @@ -1,9 +1,7 @@ -DEFS = @DLLFLAGS@ -D__WINE__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -LIBEXT = @LIBEXT@ MODULE = imagehlp SOVERSION = 1.0 @@ -18,12 +16,7 @@ C_SRCS = \ modify.c \ symbol.c -all: lib$(MODULE).$(LIBEXT) - -@MAKE_RULES@ - -clean:: - $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) +@MAKE_DLL_RULES@ ### Dependencies: diff --git a/dlls/imm32/Makefile.in b/dlls/imm32/Makefile.in index 75f6cfbe0de..7688a8c6d96 100644 --- a/dlls/imm32/Makefile.in +++ b/dlls/imm32/Makefile.in @@ -1,9 +1,7 @@ -DEFS = @DLLFLAGS@ -D__WINE__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -LIBEXT = @LIBEXT@ MODULE = imm32 SOVERSION = 1.0 @@ -12,11 +10,6 @@ SPEC_SRCS = imm32.spec C_SRCS = \ imm.c -all: lib$(MODULE).$(LIBEXT) - -@MAKE_RULES@ - -clean:: - $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) +@MAKE_DLL_RULES@ ### Dependencies: diff --git a/dlls/lzexpand/Makefile.in b/dlls/lzexpand/Makefile.in index 141620a72a1..36752e4ba2e 100644 --- a/dlls/lzexpand/Makefile.in +++ b/dlls/lzexpand/Makefile.in @@ -1,9 +1,7 @@ -DEFS = @DLLFLAGS@ -D__WINE__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -LIBEXT = @LIBEXT@ MODULE = lz32 SOVERSION = 1.0 @@ -12,12 +10,7 @@ SPEC_SRCS = lz32.spec lzexpand.spec C_SRCS = \ lzexpand_main.c -all: lib$(MODULE).$(LIBEXT) - -@MAKE_RULES@ - -clean:: - $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) +@MAKE_DLL_RULES@ ### Dependencies: diff --git a/dlls/mouse/Makefile.in b/dlls/mouse/Makefile.in index e71586b7556..baf19e4449b 100644 --- a/dlls/mouse/Makefile.in +++ b/dlls/mouse/Makefile.in @@ -17,7 +17,5 @@ all: $(MODULE).o @MAKE_RULES@ -$(RC_SRCS:.rc=.s): $(WRC) - ### Dependencies: diff --git a/dlls/msacm/Makefile.in b/dlls/msacm/Makefile.in index d5cf9569e89..e79908520f6 100644 --- a/dlls/msacm/Makefile.in +++ b/dlls/msacm/Makefile.in @@ -1,9 +1,7 @@ -DEFS = @DLLFLAGS@ -D__WINE__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -LIBEXT = @LIBEXT@ MODULE = msacm SOVERSION = 1.0 @@ -12,12 +10,7 @@ SPEC_SRCS = msacm.spec C_SRCS = \ msacm_main.c -all: lib$(MODULE).$(LIBEXT) - -@MAKE_RULES@ - -clean:: - $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) +@MAKE_DLL_RULES@ ### Dependencies: diff --git a/dlls/msacm32/Makefile.in b/dlls/msacm32/Makefile.in index 20fb64fb9be..f2eda2b2fd3 100644 --- a/dlls/msacm32/Makefile.in +++ b/dlls/msacm32/Makefile.in @@ -1,9 +1,7 @@ -DEFS = @DLLFLAGS@ -D__WINE__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -LIBEXT = @LIBEXT@ MODULE = msacm32 SOVERSION = 1.0 @@ -17,12 +15,7 @@ C_SRCS = \ msacm32_main.c \ stream.c -all: lib$(MODULE).$(LIBEXT) - -@MAKE_RULES@ - -clean:: - $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) +@MAKE_DLL_RULES@ ### Dependencies: diff --git a/dlls/msnet32/Makefile.in b/dlls/msnet32/Makefile.in index a3006f0de31..fc7ae05104d 100644 --- a/dlls/msnet32/Makefile.in +++ b/dlls/msnet32/Makefile.in @@ -1,19 +1,12 @@ -DEFS = @DLLFLAGS@ -D__WINE__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -LIBEXT = @LIBEXT@ MODULE = msnet32 SOVERSION = 1.0 SPEC_SRCS = msnet32.spec -all: lib$(MODULE).$(LIBEXT) - -@MAKE_RULES@ - -clean:: - $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) +@MAKE_DLL_RULES@ ### Dependencies: diff --git a/dlls/msvideo/Makefile.in b/dlls/msvideo/Makefile.in index 9aa1e1d2828..a4b4bc10c6e 100644 --- a/dlls/msvideo/Makefile.in +++ b/dlls/msvideo/Makefile.in @@ -1,9 +1,7 @@ -DEFS = @DLLFLAGS@ -D__WINE__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -LIBEXT = @LIBEXT@ MODULE = msvfw32 SOVERSION = 1.0 IMPORTS = winmm @@ -13,12 +11,7 @@ SPEC_SRCS = msvfw32.spec msvideo.spec C_SRCS = \ msvideo_main.c -all: lib$(MODULE).$(LIBEXT) - -@MAKE_RULES@ - -clean:: - $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) +@MAKE_DLL_RULES@ ### Dependencies: diff --git a/dlls/odbc32/Makefile.in b/dlls/odbc32/Makefile.in index 64d911ffd11..30b75df9f33 100644 --- a/dlls/odbc32/Makefile.in +++ b/dlls/odbc32/Makefile.in @@ -1,9 +1,7 @@ -DEFS = @DLLFLAGS@ -D__WINE__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -LIBEXT = @LIBEXT@ MODULE = odbc32 SOVERSION = 1.0 @@ -12,12 +10,7 @@ SPEC_SRCS = odbc32.spec C_SRCS = \ proxyodbc.c -all: lib$(MODULE).$(LIBEXT) - -@MAKE_RULES@ - -clean:: - $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) +@MAKE_DLL_RULES@ ### Dependencies: diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in index 833f28123a7..14c1612dc9c 100644 --- a/dlls/ole32/Makefile.in +++ b/dlls/ole32/Makefile.in @@ -1,9 +1,7 @@ -DEFS = @DLLFLAGS@ -D__WINE__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -LIBEXT = @LIBEXT@ MODULE = ole32 SOVERSION = 1.0 @@ -32,12 +30,7 @@ C_SRCS = \ storage.c \ storage32.c -all: lib$(MODULE).$(LIBEXT) - -@MAKE_RULES@ - -clean:: - $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) +@MAKE_DLL_RULES@ ### Dependencies: diff --git a/dlls/oleaut32/Makefile.in b/dlls/oleaut32/Makefile.in index 177a0c70598..eceba18e38f 100644 --- a/dlls/oleaut32/Makefile.in +++ b/dlls/oleaut32/Makefile.in @@ -1,9 +1,7 @@ -DEFS = @DLLFLAGS@ -D__WINE__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -LIBEXT = @LIBEXT@ MODULE = oleaut32 SOVERSION = 1.0 IMPORTS = ole32 comctl32 winmm @@ -20,12 +18,7 @@ C_SRCS = \ typelib.c \ variant.c -all: lib$(MODULE).$(LIBEXT) - -@MAKE_RULES@ - -clean:: - $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) +@MAKE_DLL_RULES@ ### Dependencies: diff --git a/dlls/olecli/Makefile.in b/dlls/olecli/Makefile.in index afb440f6004..60d875458e9 100644 --- a/dlls/olecli/Makefile.in +++ b/dlls/olecli/Makefile.in @@ -1,9 +1,7 @@ -DEFS = @DLLFLAGS@ -D__WINE__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -LIBEXT = @LIBEXT@ MODULE = olecli32 SOVERSION = 1.0 IMPORTS = olesvr32 ole32 @@ -13,12 +11,7 @@ SPEC_SRCS = olecli32.spec olecli.spec C_SRCS = \ olecli_main.c -all: lib$(MODULE).$(LIBEXT) - -@MAKE_RULES@ - -clean:: - $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) +@MAKE_DLL_RULES@ ### Dependencies: diff --git a/dlls/oledlg/Makefile.in b/dlls/oledlg/Makefile.in index afb4dc7b3a3..7b1efc84e7e 100644 --- a/dlls/oledlg/Makefile.in +++ b/dlls/oledlg/Makefile.in @@ -1,9 +1,7 @@ -DEFS = @DLLFLAGS@ -D__WINE__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -LIBEXT = @LIBEXT@ MODULE = oledlg SOVERSION = 1.0 @@ -12,12 +10,7 @@ SPEC_SRCS = oledlg.spec C_SRCS = \ oledlg_main.c -all: lib$(MODULE).$(LIBEXT) - -@MAKE_RULES@ - -clean:: - $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) +@MAKE_DLL_RULES@ ### Dependencies: diff --git a/dlls/olepro32/Makefile.in b/dlls/olepro32/Makefile.in index 462301e8e75..65027bc8c9d 100644 --- a/dlls/olepro32/Makefile.in +++ b/dlls/olepro32/Makefile.in @@ -1,9 +1,7 @@ -DEFS = @DLLFLAGS@ -D__WINE__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -LIBEXT = @LIBEXT@ MODULE = olepro32 SOVERSION = 1.0 IMPORTS = oleaut32 ole32 @@ -12,11 +10,6 @@ SPEC_SRCS = olepro32.spec C_SRCS = olepro32stubs.c -all: lib$(MODULE).$(LIBEXT) - -@MAKE_RULES@ - -clean:: - $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) +@MAKE_DLL_RULES@ ### Dependencies: diff --git a/dlls/olesvr/Makefile.in b/dlls/olesvr/Makefile.in index 9cc1b491f98..55d00708cb9 100644 --- a/dlls/olesvr/Makefile.in +++ b/dlls/olesvr/Makefile.in @@ -1,9 +1,7 @@ -DEFS = @DLLFLAGS@ -D__WINE__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -LIBEXT = @LIBEXT@ MODULE = olesvr32 SOVERSION = 1.0 @@ -12,12 +10,7 @@ SPEC_SRCS = olesvr32.spec olesvr.spec C_SRCS = \ olesvr_main.c -all: lib$(MODULE).$(LIBEXT) - -@MAKE_RULES@ - -clean:: - $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) +@MAKE_DLL_RULES@ ### Dependencies: diff --git a/dlls/psapi/Makefile.in b/dlls/psapi/Makefile.in index d02fa9108a1..dd22246a4a5 100644 --- a/dlls/psapi/Makefile.in +++ b/dlls/psapi/Makefile.in @@ -1,9 +1,7 @@ -DEFS = @DLLFLAGS@ -D__WINE__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -LIBEXT = @LIBEXT@ MODULE = psapi SOVERSION = 1.0 @@ -12,12 +10,7 @@ SPEC_SRCS = psapi.spec C_SRCS = \ psapi_main.c -all: lib$(MODULE).$(LIBEXT) - -@MAKE_RULES@ - -clean:: - $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) +@MAKE_DLL_RULES@ ### Dependencies: diff --git a/dlls/rasapi32/Makefile.in b/dlls/rasapi32/Makefile.in index ca642bc3ce9..9dc32f82f1a 100644 --- a/dlls/rasapi32/Makefile.in +++ b/dlls/rasapi32/Makefile.in @@ -1,9 +1,7 @@ -DEFS = @DLLFLAGS@ -D__WINE__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -LIBEXT = @LIBEXT@ MODULE = rasapi32 SOVERSION = 1.0 @@ -11,12 +9,7 @@ SPEC_SRCS = rasapi32.spec rasapi16.spec C_SRCS = rasapi.c -all: lib$(MODULE).$(LIBEXT) - -@MAKE_RULES@ - -clean:: - $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) +@MAKE_DLL_RULES@ ### Dependencies: diff --git a/dlls/setupx/Makefile.in b/dlls/setupx/Makefile.in index b1b1bdb70f5..495b46d9a7d 100644 --- a/dlls/setupx/Makefile.in +++ b/dlls/setupx/Makefile.in @@ -1,9 +1,7 @@ -DEFS = @DLLFLAGS@ -D__WINE__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -LIBEXT = @LIBEXT@ MODULE = setupx SOVERSION = 1.0 @@ -12,11 +10,6 @@ SPEC_SRCS = setupx.spec C_SRCS = \ setupx_main.c -all: lib$(MODULE).$(LIBEXT) - -@MAKE_RULES@ - -clean:: - $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) +@MAKE_DLL_RULES@ ### Dependencies: diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index 29c6d0bdc79..5c71c8c07d4 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -1,9 +1,7 @@ -DEFS = @DLLFLAGS@ -D__WINE__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -LIBEXT = @LIBEXT@ MODULE = shell32 SOVERSION = 1.0 IMPORTS = ole32 comctl32 winmm @@ -45,17 +43,9 @@ C_SRCS = \ RC_SRCS= \ shres.rc -#GEN_ASM_SRCS = \ -# shellres.s +@MAKE_DLL_RULES@ -all: check_wrc lib$(MODULE).$(LIBEXT) - -@MAKE_RULES@ - -$(RC_SRCS:.rc=.s): $(WRC) - -clean:: - $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) +all: check_wrc ### Dependencies: diff --git a/dlls/sound/Makefile.in b/dlls/sound/Makefile.in index 9c056b88258..e0b7004100f 100644 --- a/dlls/sound/Makefile.in +++ b/dlls/sound/Makefile.in @@ -1,9 +1,7 @@ -DEFS = @DLLFLAGS@ -D__WINE__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -LIBEXT = @LIBEXT@ MODULE = sound SOVERSION = 1.0 @@ -12,12 +10,7 @@ SPEC_SRCS = sound.spec C_SRCS = \ sound_main.c -all: lib$(MODULE).$(LIBEXT) - -@MAKE_RULES@ - -clean:: - $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) +@MAKE_DLL_RULES@ ### Dependencies: diff --git a/dlls/stress/Makefile.in b/dlls/stress/Makefile.in index 885b6a7b5b1..1962b37ab6d 100644 --- a/dlls/stress/Makefile.in +++ b/dlls/stress/Makefile.in @@ -1,9 +1,7 @@ -DEFS = @DLLFLAGS@ -D__WINE__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -LIBEXT = @LIBEXT@ MODULE = stress SOVERSION = 1.0 @@ -12,12 +10,7 @@ SPEC_SRCS = stress.spec C_SRCS = \ stress_main.c -all: lib$(MODULE).$(LIBEXT) - -@MAKE_RULES@ - -clean:: - $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) +@MAKE_DLL_RULES@ ### Dependencies: diff --git a/dlls/tapi32/Makefile.in b/dlls/tapi32/Makefile.in index cc7b74f7b4e..4933b2c3fd5 100644 --- a/dlls/tapi32/Makefile.in +++ b/dlls/tapi32/Makefile.in @@ -1,9 +1,7 @@ -DEFS = @DLLFLAGS@ -D__WINE__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -LIBEXT = @LIBEXT@ MODULE = tapi32 SOVERSION = 1.0 @@ -14,12 +12,7 @@ C_SRCS = \ line.c \ phone.c -all: lib$(MODULE).$(LIBEXT) - -@MAKE_RULES@ - -clean:: - $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) +@MAKE_DLL_RULES@ ### Dependencies: diff --git a/dlls/version/Makefile.in b/dlls/version/Makefile.in index 5c31a4e5a4a..5bf2966f0cd 100644 --- a/dlls/version/Makefile.in +++ b/dlls/version/Makefile.in @@ -1,9 +1,7 @@ -DEFS = @DLLFLAGS@ -D__WINE__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -LIBEXT = @LIBEXT@ MODULE = version SOVERSION = 1.0 IMPORTS = lz32 @@ -16,11 +14,6 @@ C_SRCS = \ resource.c \ ver16.c -all: lib$(MODULE).$(LIBEXT) - -@MAKE_RULES@ - -clean:: - $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) +@MAKE_DLL_RULES@ ### Dependencies: diff --git a/dlls/win32s/Makefile.in b/dlls/win32s/Makefile.in index 22d9bc3ca11..524d4e61351 100644 --- a/dlls/win32s/Makefile.in +++ b/dlls/win32s/Makefile.in @@ -1,9 +1,7 @@ -DEFS = @DLLFLAGS@ -D__WINE__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -LIBEXT = @LIBEXT@ MODULE = w32skrnl SOVERSION = 1.0 @@ -14,12 +12,7 @@ C_SRCS = \ w32sys.c \ win32s16.c -all: lib$(MODULE).$(LIBEXT) - -@MAKE_RULES@ - -clean:: - $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) +@MAKE_DLL_RULES@ ### Dependencies: diff --git a/dlls/win87em/Makefile.in b/dlls/win87em/Makefile.in index 36eef493792..6cf2a37bad5 100644 --- a/dlls/win87em/Makefile.in +++ b/dlls/win87em/Makefile.in @@ -1,9 +1,7 @@ -DEFS = @DLLFLAGS@ -D__WINE__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -LIBEXT = @LIBEXT@ MODULE = win87em SOVERSION = 1.0 @@ -12,11 +10,6 @@ SPEC_SRCS = win87em.spec C_SRCS = \ emulate.c -all: lib$(MODULE).$(LIBEXT) - -@MAKE_RULES@ - -clean:: - $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) +@MAKE_DLL_RULES@ ### Dependencies: diff --git a/dlls/windebug/Makefile.in b/dlls/windebug/Makefile.in index ca2e742989f..74fedfd0bb6 100644 --- a/dlls/windebug/Makefile.in +++ b/dlls/windebug/Makefile.in @@ -1,9 +1,7 @@ -DEFS = @DLLFLAGS@ -D__WINE__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -LIBEXT = @LIBEXT@ MODULE = windebug SOVERSION = 1.0 @@ -12,12 +10,7 @@ SPEC_SRCS = windebug.spec C_SRCS = \ windebug_main.c -all: lib$(MODULE).$(LIBEXT) - -@MAKE_RULES@ - -clean:: - $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) +@MAKE_DLL_RULES@ ### Dependencies: diff --git a/dlls/wing/Makefile.in b/dlls/wing/Makefile.in index 830b1bf2b0a..fdfe0d1bcf9 100644 --- a/dlls/wing/Makefile.in +++ b/dlls/wing/Makefile.in @@ -1,9 +1,7 @@ -DEFS = @DLLFLAGS@ -D__WINE__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -LIBEXT = @LIBEXT@ MODULE = wing SOVERSION = 1.0 @@ -12,12 +10,7 @@ SPEC_SRCS = wing.spec C_SRCS = \ wing_main.c -all: lib$(MODULE).$(LIBEXT) - -@MAKE_RULES@ - -clean:: - $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) +@MAKE_DLL_RULES@ ### Dependencies: diff --git a/dlls/winmm/Makefile.in b/dlls/winmm/Makefile.in index bb502bf6030..60af6452f07 100644 --- a/dlls/winmm/Makefile.in +++ b/dlls/winmm/Makefile.in @@ -1,9 +1,7 @@ -DEFS = @DLLFLAGS@ -D__WINE__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -LIBEXT = @LIBEXT@ MODULE = winmm SOVERSION = 1.0 WRCEXTRA = -s -pwinmm @@ -27,8 +25,6 @@ GLUE = lolvldrv.c \ RC_SRCS= \ winmm_res.rc -all: check_wrc $ lib$(MODULE).$(LIBEXT) - SUBDIRS = \ joystick \ mcianim \ @@ -40,14 +36,11 @@ SUBDIRS = \ wavemap \ wineoss -$(SUBDIRS): dummy - @cd $@; $(MAKE) - -@MAKE_RULES@ +@MAKE_DLL_RULES@ -$(RC_SRCS:.rc=.s): $(WRC) +all: check_wrc -clean:: - $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) +$(SUBDIRS): dummy + @cd $@ && $(MAKE) ### Dependencies: diff --git a/dlls/winmm/joystick/Makefile.in b/dlls/winmm/joystick/Makefile.in index 028d2d37ad8..462395f79ef 100644 --- a/dlls/winmm/joystick/Makefile.in +++ b/dlls/winmm/joystick/Makefile.in @@ -1,9 +1,7 @@ -DEFS = @DLLFLAGS@ -D__WINE__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -LIBEXT = @LIBEXT@ MODULE = joystick.drv SOVERSION = 1.0 IMPORTS = winmm @@ -14,11 +12,6 @@ SPEC_SRCS = \ C_SRCS = \ joystick.c -all: lib$(MODULE).$(LIBEXT) - -@MAKE_RULES@ - -clean:: - $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) +@MAKE_DLL_RULES@ ### Dependencies: diff --git a/dlls/winmm/mcianim/Makefile.in b/dlls/winmm/mcianim/Makefile.in index d54653a3bd3..07128d2cf6e 100644 --- a/dlls/winmm/mcianim/Makefile.in +++ b/dlls/winmm/mcianim/Makefile.in @@ -1,9 +1,7 @@ -DEFS = @DLLFLAGS@ -D__WINE__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -LIBEXT = @LIBEXT@ MODULE = mcianim.drv SOVERSION = 1.0 IMPORTS = winmm @@ -14,11 +12,6 @@ SPEC_SRCS = \ C_SRCS = \ mcianim.c -all: lib$(MODULE).$(LIBEXT) - -@MAKE_RULES@ - -clean:: - $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) +@MAKE_DLL_RULES@ ### Dependencies: diff --git a/dlls/winmm/mciavi/Makefile.in b/dlls/winmm/mciavi/Makefile.in index 1a485172bfa..2cd327b23d0 100644 --- a/dlls/winmm/mciavi/Makefile.in +++ b/dlls/winmm/mciavi/Makefile.in @@ -1,9 +1,7 @@ -DEFS = @DLLFLAGS@ -D__WINE__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -LIBEXT = @LIBEXT@ MODULE = mciavi.drv SOVERSION = 1.0 IMPORTS = winmm @@ -14,11 +12,6 @@ SPEC_SRCS = \ C_SRCS = \ mciavi.c -all: lib$(MODULE).$(LIBEXT) - -@MAKE_RULES@ - -clean:: - $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) +@MAKE_DLL_RULES@ ### Dependencies: diff --git a/dlls/winmm/mcicda/Makefile.in b/dlls/winmm/mcicda/Makefile.in index da823f641bb..ac1a3cd6b7b 100644 --- a/dlls/winmm/mcicda/Makefile.in +++ b/dlls/winmm/mcicda/Makefile.in @@ -1,9 +1,7 @@ -DEFS = @DLLFLAGS@ -D__WINE__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -LIBEXT = @LIBEXT@ MODULE = mcicda.drv SOVERSION = 1.0 IMPORTS = winmm @@ -14,11 +12,6 @@ SPEC_SRCS = \ C_SRCS = \ mcicda.c -all: lib$(MODULE).$(LIBEXT) - -@MAKE_RULES@ - -clean:: - $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) +@MAKE_DLL_RULES@ ### Dependencies: diff --git a/dlls/winmm/mciseq/Makefile.in b/dlls/winmm/mciseq/Makefile.in index e4136b7869b..f26be6adf4e 100644 --- a/dlls/winmm/mciseq/Makefile.in +++ b/dlls/winmm/mciseq/Makefile.in @@ -1,9 +1,7 @@ -DEFS = @DLLFLAGS@ -D__WINE__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -LIBEXT = @LIBEXT@ MODULE = mciseq.drv SOVERSION = 1.0 IMPORTS = winmm @@ -14,11 +12,6 @@ SPEC_SRCS = \ C_SRCS = \ mcimidi.c -all: lib$(MODULE).$(LIBEXT) - -@MAKE_RULES@ - -clean:: - $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) +@MAKE_DLL_RULES@ ### Dependencies: diff --git a/dlls/winmm/mciwave/Makefile.in b/dlls/winmm/mciwave/Makefile.in index 26e6f69785c..93075b4b99d 100644 --- a/dlls/winmm/mciwave/Makefile.in +++ b/dlls/winmm/mciwave/Makefile.in @@ -1,9 +1,7 @@ -DEFS = @DLLFLAGS@ -D__WINE__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -LIBEXT = @LIBEXT@ MODULE = mciwave.drv SOVERSION = 1.0 IMPORTS = winmm @@ -14,11 +12,6 @@ SPEC_SRCS = \ C_SRCS = \ mciwave.c -all: lib$(MODULE).$(LIBEXT) - -@MAKE_RULES@ - -clean:: - $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) +@MAKE_DLL_RULES@ ### Dependencies: diff --git a/dlls/winmm/midimap/Makefile.in b/dlls/winmm/midimap/Makefile.in index b50fe282947..827783af4c4 100644 --- a/dlls/winmm/midimap/Makefile.in +++ b/dlls/winmm/midimap/Makefile.in @@ -1,9 +1,7 @@ -DEFS = @DLLFLAGS@ -D__WINE__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -LIBEXT = @LIBEXT@ MODULE = midimap.drv SOVERSION = 1.0 IMPORTS = winmm @@ -14,11 +12,6 @@ SPEC_SRCS = \ C_SRCS = \ midimap.c -all: lib$(MODULE).$(LIBEXT) - -@MAKE_RULES@ - -clean:: - $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) +@MAKE_DLL_RULES@ ### Dependencies: diff --git a/dlls/winmm/wavemap/Makefile.in b/dlls/winmm/wavemap/Makefile.in index 6b4b323ce45..e5194fe8348 100644 --- a/dlls/winmm/wavemap/Makefile.in +++ b/dlls/winmm/wavemap/Makefile.in @@ -1,9 +1,7 @@ -DEFS = @DLLFLAGS@ -D__WINE__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -LIBEXT = @LIBEXT@ MODULE = msacm.drv SOVERSION = 1.0 IMPORTS = winmm @@ -14,11 +12,6 @@ SPEC_SRCS = \ C_SRCS = \ wavemap.c -all: lib$(MODULE).$(LIBEXT) - -@MAKE_RULES@ - -clean:: - $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) +@MAKE_DLL_RULES@ ### Dependencies: diff --git a/dlls/winmm/wineoss/Makefile.in b/dlls/winmm/wineoss/Makefile.in index bb1f5e71e72..6672f2741ad 100644 --- a/dlls/winmm/wineoss/Makefile.in +++ b/dlls/winmm/wineoss/Makefile.in @@ -1,9 +1,7 @@ -DEFS = @DLLFLAGS@ -D__WINE__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -LIBEXT = @LIBEXT@ MODULE = wineoss.drv SOVERSION = 1.0 IMPORTS = winmm @@ -19,11 +17,6 @@ C_SRCS = \ mmaux.c \ oss.c -all: lib$(MODULE).$(LIBEXT) - -@MAKE_RULES@ - -clean:: - $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) +@MAKE_DLL_RULES@ ### Dependencies: diff --git a/dlls/winsock/Makefile.in b/dlls/winsock/Makefile.in index 7cbba7d456f..29e6b2b9687 100644 --- a/dlls/winsock/Makefile.in +++ b/dlls/winsock/Makefile.in @@ -1,9 +1,7 @@ -DEFS = @DLLFLAGS@ -D__WINE__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -LIBEXT = @LIBEXT@ MODULE = wsock32 SOVERSION = 1.0 @@ -13,11 +11,6 @@ C_SRCS = \ async.c \ socket.c -all: lib$(MODULE).$(LIBEXT) - -@MAKE_RULES@ - -clean:: - $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) +@MAKE_DLL_RULES@ ### Dependencies: diff --git a/dlls/winspool/Makefile.in b/dlls/winspool/Makefile.in index 7ada8095606..c948ec55fc6 100644 --- a/dlls/winspool/Makefile.in +++ b/dlls/winspool/Makefile.in @@ -1,9 +1,7 @@ -DEFS = @DLLFLAGS@ -D__WINE__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -LIBEXT = @LIBEXT@ MODULE = winspool SOVERSION = 1.0 @@ -13,12 +11,7 @@ C_SRCS = \ info.c \ wspool.c -all: lib$(MODULE).$(LIBEXT) - -@MAKE_RULES@ - -clean:: - $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) +@MAKE_DLL_RULES@ ### Dependencies: diff --git a/dlls/wnaspi32/Makefile.in b/dlls/wnaspi32/Makefile.in index 7ca0a9a979d..bbbb5f99ba0 100644 --- a/dlls/wnaspi32/Makefile.in +++ b/dlls/wnaspi32/Makefile.in @@ -1,9 +1,7 @@ -DEFS = @DLLFLAGS@ -D__WINE__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -LIBEXT = @LIBEXT@ MODULE = wnaspi32 SOVERSION = 1.0 @@ -12,11 +10,6 @@ SPEC_SRCS = wnaspi32.spec C_SRCS = \ winaspi32.c -all: lib$(MODULE).$(LIBEXT) - -@MAKE_RULES@ - -clean:: - $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) +@MAKE_DLL_RULES@ ### Dependencies: diff --git a/resources/Makefile.in b/resources/Makefile.in index cba959ec201..388a1e6eec8 100644 --- a/resources/Makefile.in +++ b/resources/Makefile.in @@ -13,6 +13,4 @@ all: check_wrc $(MODULE).o @MAKE_RULES@ -$(RC_SRCS:.rc=.s): $(WRC) - ### Dependencies: -- 2.11.4.GIT