Commit e318b4a5 authored by Alexandre Julliard's avatar Alexandre Julliard

makefiles: Move the static library rules to the global Make.rules file.

parent 44f5d4bd
...@@ -109,6 +109,20 @@ CROSSOBJS = $(OBJS:.o=.cross.o) ...@@ -109,6 +109,20 @@ CROSSOBJS = $(OBJS:.o=.cross.o)
dlldata.c: $(WIDL) Makefile.in dlldata.c: $(WIDL) Makefile.in
$(WIDL) $(IDLFLAGS) --dlldata-only -o $@ $(IDL_P_SRCS) $(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 # Rules for dependencies
DEPEND_SRCS = $(C_SRCS) $(OBJC_SRCS) $(RC_SRCS) $(MC_SRCS) \ DEPEND_SRCS = $(C_SRCS) $(OBJC_SRCS) $(RC_SRCS) $(MC_SRCS) \
......
...@@ -9,20 +9,6 @@ ...@@ -9,20 +9,6 @@
DLLFLAGS = @DLLFLAGS@ DLLFLAGS = @DLLFLAGS@
MAKEDEPFLAGS = -xo -xcross.o MAKEDEPFLAGS = -xo -xcross.o
@MAKE_RULES@ @CROSSTEST_DISABLE@ all: $(STATICLIB:.a=.cross.a)
all: $(MODULE) @CROSSTEST_DISABLE@ $(MODULE:.a=.cross.a)
# Rules for .a library
$(MODULE): $(OBJS) Makefile.in @MAKE_RULES@
$(RM) $@
$(AR) $(ARFLAGS) $@ $(OBJS)
$(RANLIB) $@
$(MODULE:.a=.cross.a): $(CROSSOBJS) Makefile.in
$(RM) $@
$(CROSSAR) $(ARFLAGS) $@ $(CROSSOBJS)
$(CROSSRANLIB) $@
# End of global library rules
MODULE = libadsiid.a STATICLIB = libadsiid.a
C_SRCS = \ C_SRCS = \
adsiid.c adsiid.c
......
MODULE = libdxerr8.a STATICLIB = libdxerr8.a
C_SRCS = \ C_SRCS = \
dxerr8.c dxerr8.c
......
MODULE = libdxerr9.a STATICLIB = libdxerr9.a
C_SRCS = \ C_SRCS = \
dxerr9.c dxerr9.c
......
MODULE = libdxguid.a STATICLIB = libdxguid.a
C_SRCS = \ C_SRCS = \
dx10guid.c \ dx10guid.c \
......
MODULE = libstrmbase.a STATICLIB = libstrmbase.a
C_SRCS = \ C_SRCS = \
audio.c \ audio.c \
......
MODULE = libstrmiids.a STATICLIB = libstrmiids.a
C_SRCS = \ C_SRCS = \
strmiids.c strmiids.c
......
MODULE = libuuid.a STATICLIB = libuuid.a
C_SRCS = \ C_SRCS = \
uuid.c uuid.c
......
MODULE = libwinecrt0.a STATICLIB = libwinecrt0.a
C_SRCS = \ C_SRCS = \
delay_load.c \ delay_load.c \
......
DLLFLAGS = @DLLFLAGS@ DLLFLAGS = @DLLFLAGS@
MODULE = libwine_port.a STATICLIB = libwine_port.a
C_SRCS = \ C_SRCS = \
ffs.c \ ffs.c \
...@@ -25,11 +25,4 @@ C_SRCS = \ ...@@ -25,11 +25,4 @@ C_SRCS = \
symlink.c \ symlink.c \
usleep.c usleep.c
all: $(MODULE)
@MAKE_RULES@ @MAKE_RULES@
$(MODULE): $(OBJS) Makefile.in
$(RM) $@
$(AR) $(ARFLAGS) $@ $(OBJS)
$(RANLIB) $@
DLLFLAGS = @DLLFLAGS@ DLLFLAGS = @DLLFLAGS@
EXTRALIBS = $(LIBPORT) @LIBDL@ @COREFOUNDATIONLIB@ @CORESERVICESLIB@ EXTRALIBS = $(LIBPORT) @LIBDL@ @COREFOUNDATIONLIB@ @CORESERVICESLIB@
EXTRADEFS = -DWINE_UNICODE_API="" EXTRADEFS = -DWINE_UNICODE_API=""
STATICLIB = libwine_static.a
VERSION = 1.0 VERSION = 1.0
SOVERSION = 1 SOVERSION = 1
...@@ -122,11 +123,6 @@ version.c: dummy ...@@ -122,11 +123,6 @@ version.c: dummy
$(RELPATH): $(RELPATH):
@cd $(TOOLSDIR)/tools && $(MAKE) relpath$(TOOLSEXT) @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 # Make sure that make_makefiles sees the generated rules
install install-lib:: install install-lib::
install install-dev:: install install-dev::
......
DLLFLAGS = @DLLFLAGS@ DLLFLAGS = @DLLFLAGS@
MODULE = libwpp.a STATICLIB = libwpp.a
C_SRCS = \ C_SRCS = \
preproc.c \ preproc.c \
...@@ -8,11 +8,4 @@ C_SRCS = \ ...@@ -8,11 +8,4 @@ C_SRCS = \
LEX_SRCS = ppl.l LEX_SRCS = ppl.l
BISON_SRCS = ppy.y BISON_SRCS = ppy.y
all: $(MODULE)
@MAKE_RULES@ @MAKE_RULES@
$(MODULE): $(OBJS)
$(RM) $@
$(AR) $(ARFLAGS) $@ $(OBJS)
$(RANLIB) $@
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment