Module: wine Branch: master Commit: e318b4a59ce238c8418e063c8b9dd9d701603908 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e318b4a59ce238c8418e063c8b...
Author: Alexandre Julliard julliard@winehq.org Date: Sat Oct 5 11:01:58 2013 +0200
makefiles: Move the static library rules to the global Make.rules file.
---
Make.rules.in | 14 ++++++++++++++ dlls/Makeimplib.rules.in | 18 ++---------------- dlls/adsiid/Makefile.in | 2 +- dlls/dxerr8/Makefile.in | 2 +- dlls/dxerr9/Makefile.in | 2 +- dlls/dxguid/Makefile.in | 2 +- dlls/strmbase/Makefile.in | 2 +- dlls/strmiids/Makefile.in | 2 +- dlls/uuid/Makefile.in | 2 +- dlls/winecrt0/Makefile.in | 2 +- libs/port/Makefile.in | 9 +-------- libs/wine/Makefile.in | 6 +----- libs/wpp/Makefile.in | 9 +-------- 13 files changed, 27 insertions(+), 45 deletions(-)
diff --git a/Make.rules.in b/Make.rules.in index db3a45f..fb7ac3e 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -109,6 +109,20 @@ CROSSOBJS = $(OBJS:.o=.cross.o) dlldata.c: $(WIDL) Makefile.in $(WIDL) $(IDLFLAGS) --dlldata-only -o $@ $(IDL_P_SRCS)
+# Rules for static libraries + +all: $(STATICLIB) + +$(STATICLIB): $(OBJS) Makefile.in + $(RM) $@ + $(AR) $(ARFLAGS) $@ $(OBJS) + $(RANLIB) $@ + +$(STATICLIB:.a=.cross.a): $(CROSSOBJS) Makefile.in + $(RM) $@ + $(CROSSAR) $(ARFLAGS) $@ $(CROSSOBJS) + $(CROSSRANLIB) $@ + # Rules for dependencies
DEPEND_SRCS = $(C_SRCS) $(OBJC_SRCS) $(RC_SRCS) $(MC_SRCS) \ diff --git a/dlls/Makeimplib.rules.in b/dlls/Makeimplib.rules.in index 5112948..5e59a50 100644 --- a/dlls/Makeimplib.rules.in +++ b/dlls/Makeimplib.rules.in @@ -9,20 +9,6 @@ DLLFLAGS = @DLLFLAGS@ MAKEDEPFLAGS = -xo -xcross.o
-@MAKE_RULES@ - -all: $(MODULE) @CROSSTEST_DISABLE@ $(MODULE:.a=.cross.a) - -# Rules for .a library +@CROSSTEST_DISABLE@ all: $(STATICLIB:.a=.cross.a)
-$(MODULE): $(OBJS) Makefile.in - $(RM) $@ - $(AR) $(ARFLAGS) $@ $(OBJS) - $(RANLIB) $@ - -$(MODULE:.a=.cross.a): $(CROSSOBJS) Makefile.in - $(RM) $@ - $(CROSSAR) $(ARFLAGS) $@ $(CROSSOBJS) - $(CROSSRANLIB) $@ - -# End of global library rules +@MAKE_RULES@ diff --git a/dlls/adsiid/Makefile.in b/dlls/adsiid/Makefile.in index a5b27d5..221f19a 100644 --- a/dlls/adsiid/Makefile.in +++ b/dlls/adsiid/Makefile.in @@ -1,4 +1,4 @@ -MODULE = libadsiid.a +STATICLIB = libadsiid.a
C_SRCS = \ adsiid.c diff --git a/dlls/dxerr8/Makefile.in b/dlls/dxerr8/Makefile.in index aa46a26..dbd9b02 100644 --- a/dlls/dxerr8/Makefile.in +++ b/dlls/dxerr8/Makefile.in @@ -1,4 +1,4 @@ -MODULE = libdxerr8.a +STATICLIB = libdxerr8.a
C_SRCS = \ dxerr8.c diff --git a/dlls/dxerr9/Makefile.in b/dlls/dxerr9/Makefile.in index 57edb14..c85f648 100644 --- a/dlls/dxerr9/Makefile.in +++ b/dlls/dxerr9/Makefile.in @@ -1,4 +1,4 @@ -MODULE = libdxerr9.a +STATICLIB = libdxerr9.a
C_SRCS = \ dxerr9.c diff --git a/dlls/dxguid/Makefile.in b/dlls/dxguid/Makefile.in index a47a51f..261e0d0 100644 --- a/dlls/dxguid/Makefile.in +++ b/dlls/dxguid/Makefile.in @@ -1,4 +1,4 @@ -MODULE = libdxguid.a +STATICLIB = libdxguid.a
C_SRCS = \ dx10guid.c \ diff --git a/dlls/strmbase/Makefile.in b/dlls/strmbase/Makefile.in index 3ac7c56..473cbdd 100644 --- a/dlls/strmbase/Makefile.in +++ b/dlls/strmbase/Makefile.in @@ -1,4 +1,4 @@ -MODULE = libstrmbase.a +STATICLIB = libstrmbase.a
C_SRCS = \ audio.c \ diff --git a/dlls/strmiids/Makefile.in b/dlls/strmiids/Makefile.in index 744682e..3ed9247 100644 --- a/dlls/strmiids/Makefile.in +++ b/dlls/strmiids/Makefile.in @@ -1,4 +1,4 @@ -MODULE = libstrmiids.a +STATICLIB = libstrmiids.a
C_SRCS = \ strmiids.c diff --git a/dlls/uuid/Makefile.in b/dlls/uuid/Makefile.in index bc35e69..904c354 100644 --- a/dlls/uuid/Makefile.in +++ b/dlls/uuid/Makefile.in @@ -1,4 +1,4 @@ -MODULE = libuuid.a +STATICLIB = libuuid.a
C_SRCS = \ uuid.c diff --git a/dlls/winecrt0/Makefile.in b/dlls/winecrt0/Makefile.in index 23dca02..99cd65f 100644 --- a/dlls/winecrt0/Makefile.in +++ b/dlls/winecrt0/Makefile.in @@ -1,4 +1,4 @@ -MODULE = libwinecrt0.a +STATICLIB = libwinecrt0.a
C_SRCS = \ delay_load.c \ diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 3f42fd4..bcf4c66 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -1,5 +1,5 @@ DLLFLAGS = @DLLFLAGS@ -MODULE = libwine_port.a +STATICLIB = libwine_port.a
C_SRCS = \ ffs.c \ @@ -25,11 +25,4 @@ C_SRCS = \ symlink.c \ usleep.c
-all: $(MODULE) - @MAKE_RULES@ - -$(MODULE): $(OBJS) Makefile.in - $(RM) $@ - $(AR) $(ARFLAGS) $@ $(OBJS) - $(RANLIB) $@ diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index ad9c3c9..24635c1 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -1,6 +1,7 @@ DLLFLAGS = @DLLFLAGS@ EXTRALIBS = $(LIBPORT) @LIBDL@ @COREFOUNDATIONLIB@ @CORESERVICESLIB@ EXTRADEFS = -DWINE_UNICODE_API="" +STATICLIB = libwine_static.a
VERSION = 1.0 SOVERSION = 1 @@ -122,11 +123,6 @@ version.c: dummy $(RELPATH): @cd $(TOOLSDIR)/tools && $(MAKE) relpath$(TOOLSEXT)
-all: libwine_static.a - -libwine_static.a: $(OBJS) Makefile.in - $(AR) $(ARFLAGS) $@ $(OBJS) - # Make sure that make_makefiles sees the generated rules install install-lib:: install install-dev:: diff --git a/libs/wpp/Makefile.in b/libs/wpp/Makefile.in index 4cd080e..668c137 100644 --- a/libs/wpp/Makefile.in +++ b/libs/wpp/Makefile.in @@ -1,5 +1,5 @@ DLLFLAGS = @DLLFLAGS@ -MODULE = libwpp.a +STATICLIB = libwpp.a
C_SRCS = \ preproc.c \ @@ -8,11 +8,4 @@ C_SRCS = \ LEX_SRCS = ppl.l BISON_SRCS = ppy.y
-all: $(MODULE) - @MAKE_RULES@ - -$(MODULE): $(OBJS) - $(RM) $@ - $(AR) $(ARFLAGS) $@ $(OBJS) - $(RANLIB) $@