Module: wine Branch: master Commit: f78a8ceafc6cdc5dcecf67ff8972973a9e00fcb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f78a8ceafc6cdc5dcecf67ff89...
Author: Alexandre Julliard julliard@winehq.org Date: Tue Aug 18 11:29:35 2009 +0200
makefiles: Add rules for building fake modules.
---
.gitignore | 1 + Make.rules.in | 3 ++- dlls/Makedll.rules.in | 7 +++---- programs/Makeprog.rules.in | 4 ++-- tools/make_makefiles | 1 + 5 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/.gitignore b/.gitignore index 305cd7b..78ae433 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ # Automatically generated by make_makefiles; DO NOT EDIT!! *.[oa] +*.fake *.ok *.res *.so diff --git a/Make.rules.in b/Make.rules.in index 2b83943..9ce72d1 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -52,6 +52,7 @@ LINTFLAGS = @LINTFLAGS@ FONTFORGE = @FONTFORGE@ RSVG = @RSVG@ ICOTOOL = @ICOTOOL@ +FAKEEXT = $(DLLEXT:.so=.fake) INCLUDES = -I$(SRCDIR) -I. -I$(TOPSRCDIR)/include -I$(TOPOBJDIR)/include $(EXTRAINCL) EXTRACFLAGS = @EXTRACFLAGS@ ALLCFLAGS = $(INCLUDES) $(DEFS) $(DLLFLAGS) $(EXTRACFLAGS) $(CPPFLAGS) $(CFLAGS) $(MODCFLAGS) @@ -108,7 +109,7 @@ dlldir = @libdir@/wine prog_manext = 1 api_manext = 3w conf_manext = 5 -CLEAN_FILES = *.o *.a *.so *.ln *.res *.$(LIBEXT) \#*\# *~ *% .\#* *.bak *.orig *.rej *.flc core +CLEAN_FILES = *.o *.a *.so *.ln *.res *.fake *.$(LIBEXT) \#*\# *~ *% .\#* *.bak *.orig *.rej *.flc core
IDL_GEN_C_SRCS = $(IDL_C_SRCS:.idl=_c.c) $(IDL_I_SRCS:.idl=_i.c) \ $(IDL_P_SRCS:.idl=_p.c) $(IDL_S_SRCS:.idl=_s.c) diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in index 9c7be29..a2c981e 100644 --- a/dlls/Makedll.rules.in +++ b/dlls/Makedll.rules.in @@ -9,7 +9,6 @@ #
DLLFLAGS = @DLLFLAGS@ -DLLEXT = @DLLEXT@ MINGWAR = @MINGWAR@ DEFS = -D__WINESRC__ $(EXTRADEFS) BASEMODULE = $(MODULE:%.dll=%) @@ -24,11 +23,11 @@ STATICIMPLIB = $(IMPORTLIBFILE:.def=.def.a) DLL_LDPATH = -L$(DLLDIR) $(DELAYIMPORTS:%=-L$(DLLDIR)/%) $(IMPORTS:%=-L$(DLLDIR)/%) INSTALLDIRS = $(DESTDIR)$(dlldir) $(DESTDIR)$(datadir)/wine
-all: $(MODULE)$(DLLEXT) $(SUBDIRS) - @MAKE_RULES@
-$(MODULE) $(MODULE).so: $(MAINSPEC) $(ALL_OBJS) Makefile.in +all: $(MODULE)$(DLLEXT) $(MODULE)$(FAKEEXT) $(SUBDIRS) + +$(MODULE) $(MODULE).so $(MODULE).fake: $(MAINSPEC) $(ALL_OBJS) Makefile.in $(WINEGCC) -shared $(SRCDIR)/$(MAINSPEC) $(ALL_OBJS) $(EXTRADLLFLAGS) -o $@ $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS)
# Rules for import libraries diff --git a/programs/Makeprog.rules.in b/programs/Makeprog.rules.in index 9c361ff..4fc2093 100644 --- a/programs/Makeprog.rules.in +++ b/programs/Makeprog.rules.in @@ -17,9 +17,9 @@ INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(dlldir) $(DESTDIR)$(mandir)/man$(p
@MAKE_RULES@
-all: $(MODULE)$(DLLEXT) +all: $(MODULE)$(DLLEXT) $(MODULE)$(FAKEEXT)
-$(MODULE) $(MODULE).so: $(OBJS) Makefile.in +$(MODULE) $(MODULE).so $(MODULE).fake: $(OBJS) Makefile.in $(WINEGCC) $(APPMODE) $(OBJS) -o $@ $(ALL_LIBS) $(DELAYIMPORTS:%=-Wb,-d%)
# Rules for testing diff --git a/tools/make_makefiles b/tools/make_makefiles index cd495be..3883333 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -58,6 +58,7 @@ my %dont_install = # Default patterns for top-level .gitignore my @ignores = ( "*.[oa]", + "*.fake", "*.ok", "*.res", "*.so",