Alexandre Julliard : makefiles: Move the main module rules to the global Make.rules file.
Alexandre Julliard
julliard at winehq.org
Wed Oct 9 14:22:14 CDT 2013
Module: wine
Branch: master
Commit: fabd3120c599ddd6012ef44c6c14ba0f6b0a9877
URL: http://source.winehq.org/git/wine.git/?a=commit;h=fabd3120c599ddd6012ef44c6c14ba0f6b0a9877
Author: Alexandre Julliard <julliard at winehq.org>
Date: Sat Oct 5 11:22:18 2013 +0200
makefiles: Move the main module rules to the global Make.rules file.
---
Make.rules.in | 7 ++++++-
Maketest.rules.in | 14 +++++++-------
dlls/Makedll.rules.in | 10 +++-------
programs/Makeprog.rules.in | 9 +--------
tools/winegcc/winegcc.c | 1 -
5 files changed, 17 insertions(+), 24 deletions(-)
diff --git a/Make.rules.in b/Make.rules.in
index 07b43c1..7cd84e6 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -25,7 +25,7 @@ IDL_GEN_HEADERS = $(IDL_H_SRCS:.idl=.h) $(IDL_C_SRCS:.idl=.h) $(IDL_I_SRCS:.idl=
$(IDL_P_SRCS:.idl=.h) $(IDL_S_SRCS:.idl=.h)
CLEAN_FILES = *.o *.a *.so *.mo *.res *.fake *.ok *.tab.[ch] *.yy.c
-CLEAN_TARGETS = $(IMPORTLIB:%=lib%. at IMPLIBEXT@) $(IDL_GEN_C_SRCS) $(IDL_GEN_HEADERS) \
+CLEAN_TARGETS = $(MODULE) $(IMPORTLIB:%=lib%. at IMPLIBEXT@) $(IDL_GEN_C_SRCS) $(IDL_GEN_HEADERS) \
$(IDL_TLB_SRCS:.idl=.tlb) $(IDL_P_SRCS:.idl=_p.c dlldata.c) \
$(PO_SRCS:.rc=.res rsrc.pot) $(MC_SRCS:.mc=.res msg.pot) $(XTEMPLATE_SRCS:.x=.h)
@@ -109,6 +109,11 @@ CROSSOBJS = $(OBJS:.o=.cross.o)
dlldata.c: $(WIDL) Makefile.in
$(WIDL) $(IDLFLAGS) --dlldata-only -o $@ $(IDL_P_SRCS)
+# Rules for main module
+
+$(MODULE) $(MODULE:%=%.so) $(MODULE:%=%.fake): $(MAINSPEC) $(OBJS) Makefile.in
+ $(WINEGCC) $(APPMODE) $(MODULEFLAGS) $(OBJS) -o $@ $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(DELAYIMPORTS:%=-Wb,-d%) -lwine $(LIBPORT) $(EXTRALIBS) $(LDFLAGS) $(LIBS)
+
# Rules for static libraries
all: $(STATICLIB)
diff --git a/Maketest.rules.in b/Maketest.rules.in
index 7ba3060..f77c7c7 100644
--- a/Maketest.rules.in
+++ b/Maketest.rules.in
@@ -9,9 +9,9 @@
#
DLLFLAGS = @DLLFLAGS@
-MODULE = $(TESTDLL:%.dll=%)_test.exe
+TESTMODULE = $(TESTDLL:%.dll=%)_test.exe
TESTRESULTS = $(C_SRCS:.c=.ok)
-TESTPROGRAM = $(MODULE)$(DLLEXT)
+TESTPROGRAM = $(TESTMODULE)$(DLLEXT)
WINETEST_EXE = $(TESTDLL:%.dll=%)_test-stripped.exe$(DLLEXT)
WINETEST_RES = $(top_builddir)/programs/winetest/$(TESTDLL:%.dll=%)_test.res
RUNTESTFLAGS = -q -P wine -M $(TESTDLL) -T $(top_builddir) -p $(TESTPROGRAM)
@@ -26,14 +26,14 @@ MAKEDEPFLAGS = -xo -xcross.o
all: $(TESTPROGRAM) $(WINETEST_RES)
-$(MODULE) $(MODULE).so: $(OBJS) Makefile.in
+$(TESTMODULE) $(TESTMODULE).so: $(OBJS) Makefile.in
$(WINEGCC) $(APPMODE) $(OBJS) -o $@ $(ALL_LIBS)
$(WINETEST_EXE): $(OBJS) Makefile.in
- $(WINEGCC) -s -Wb,-F,$(MODULE) $(APPMODE) $(OBJS) -o $@ $(ALL_LIBS)
+ $(WINEGCC) -s -Wb,-F,$(TESTMODULE) $(APPMODE) $(OBJS) -o $@ $(ALL_LIBS)
$(WINETEST_RES): $(WINETEST_EXE)
- echo "$(MODULE) TESTRES \"$(WINETEST_EXE)\"" | $(WRC) $(RCFLAGS) -o $@
+ echo "$(TESTMODULE) TESTRES \"$(WINETEST_EXE)\"" | $(WRC) $(RCFLAGS) -o $@
.PHONY: check test testclean crosstest
@@ -48,7 +48,7 @@ testlist.o testlist.cross.o: testlist.c $(top_srcdir)/include/wine/test.h
check test: $(TESTRESULTS)
-$(TESTRESULTS): $(MODULE)$(DLLEXT) ../$(TESTDLL)$(DLLEXT)
+$(TESTRESULTS): $(TESTMODULE)$(DLLEXT) ../$(TESTDLL)$(DLLEXT)
# Rules for cross-compiling tests
@@ -63,4 +63,4 @@ testclean::
$(RM) $(TESTRESULTS)
clean::
- $(RM) testlist.c $(MODULE) $(TESTRESULTS) $(CROSSTEST)
+ $(RM) testlist.c $(TESTMODULE) $(TESTRESULTS) $(CROSSTEST)
diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in
index 3a6e959..82322e3 100644
--- a/dlls/Makedll.rules.in
+++ b/dlls/Makedll.rules.in
@@ -8,14 +8,10 @@
#
DLLFLAGS = @DLLFLAGS@
-BASEMODULE = $(MODULE:%.dll=%)
-MAINSPEC = $(BASEMODULE).spec
-ALL_LIBS = $(LIBPORT) $(EXTRALIBS) $(LDFLAGS) $(LIBS)
+MAINSPEC = $(MODULE:%.dll=%).spec
IDL_TLB_RES = $(IDL_TLB_SRCS:.idl=_t.res)
-
- at MAKE_RULES@
+MODULEFLAGS = -shared $(srcdir)/$(MAINSPEC) $(EXTRADLLFLAGS)
all: $(MODULE)$(DLLEXT) $(MODULE)$(FAKEEXT)
-$(MODULE) $(MODULE).so $(MODULE).fake: $(MAINSPEC) $(OBJS) Makefile.in
- $(WINEGCC) -shared $(srcdir)/$(MAINSPEC) $(OBJS) $(EXTRADLLFLAGS) -o $@ $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS)
+ at MAKE_RULES@
diff --git a/programs/Makeprog.rules.in b/programs/Makeprog.rules.in
index 802baff..1813173 100644
--- a/programs/Makeprog.rules.in
+++ b/programs/Makeprog.rules.in
@@ -10,14 +10,7 @@
#
DLLFLAGS = @DLLFLAGS@
-ALL_LIBS = $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(EXTRALIBS) -lwine $(LIBPORT) $(LDFLAGS) $(LIBS)
-
- at MAKE_RULES@
all: $(MODULE)$(DLLEXT) $(MODULE)$(FAKEEXT)
-$(MODULE) $(MODULE).so $(MODULE).fake: $(OBJS) Makefile.in
- $(WINEGCC) $(APPMODE) $(OBJS) -o $@ $(ALL_LIBS) $(DELAYIMPORTS:%=-Wb,-d%)
-
-clean::
- $(RM) $(MODULE)
+ at MAKE_RULES@
diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c
index be0d31f..fe0f033 100644
--- a/tools/winegcc/winegcc.c
+++ b/tools/winegcc/winegcc.c
@@ -930,7 +930,6 @@ static void build(struct options* opts)
add_library(opts, lib_dirs, files, "kernel32");
add_library(opts, lib_dirs, files, "ntdll");
}
- if (opts->shared && !opts->nostdlib) add_library(opts, lib_dirs, files, "wine");
if (!opts->shared && opts->use_msvcrt && opts->target_platform == PLATFORM_CYGWIN)
add_library(opts, lib_dirs, files, "msvcrt");
More information about the wine-cvs
mailing list