mirror of
git://source.winehq.org/git/wine.git
synced 2024-08-31 10:14:06 +00:00
Added dependency on winestub.o
This commit is contained in:
parent
96336324cf
commit
96af9aa5b8
|
@ -139,6 +139,11 @@ $(MAKEDEP) check_makedep:
|
||||||
$(BUILD) checkbuild:
|
$(BUILD) checkbuild:
|
||||||
cd $(TOPOBJDIR)/tools; $(SUBMAKE) build@PROGEXT@
|
cd $(TOPOBJDIR)/tools; $(SUBMAKE) build@PROGEXT@
|
||||||
|
|
||||||
|
# Rule to rebuild winestub.o
|
||||||
|
|
||||||
|
$(WINESTUB) check_winestub:
|
||||||
|
cd $(TOPOBJDIR)/library; $(SUBMAKE) winestub.o
|
||||||
|
|
||||||
# Rule for main module
|
# Rule for main module
|
||||||
|
|
||||||
$(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in
|
$(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in
|
||||||
|
|
|
@ -26,12 +26,12 @@ depend::
|
||||||
@MAKE_RULES@
|
@MAKE_RULES@
|
||||||
|
|
||||||
# Override resource compiler rules
|
# Override resource compiler rules
|
||||||
icinfo: icinfo.o
|
icinfo: icinfo.o $(WINESTUB)
|
||||||
$(CC) -o icinfo icinfo.o $(LDOPTIONS) $(ALL_LIBS)
|
$(CC) -o icinfo icinfo.o $(LDOPTIONS) $(ALL_LIBS)
|
||||||
|
|
||||||
aviinfo: aviinfo.o
|
aviinfo: aviinfo.o $(WINESTUB)
|
||||||
$(CC) -o aviinfo aviinfo.o $(LDOPTIONS) $(ALL_LIBS)
|
$(CC) -o aviinfo aviinfo.o $(LDOPTIONS) $(ALL_LIBS)
|
||||||
aviplay: aviplay.o
|
aviplay: aviplay.o $(WINESTUB)
|
||||||
$(CC) -o aviplay aviplay.o $(LDOPTIONS) $(ALL_LIBS)
|
$(CC) -o aviplay aviplay.o $(LDOPTIONS) $(ALL_LIBS)
|
||||||
|
|
||||||
install: dummy
|
install: dummy
|
||||||
|
|
|
@ -43,7 +43,7 @@ depend::
|
||||||
$(CPP) $(DEFS) $(OPTIONS) $(DIVINCL) -DRC_INVOKED -P -x c $< | $(WRC) $(WRCFLAGS) $(WRCEXTRA) -nH $*.h
|
$(CPP) $(DEFS) $(OPTIONS) $(DIVINCL) -DRC_INVOKED -P -x c $< | $(WRC) $(WRCFLAGS) $(WRCEXTRA) -nH $*.h
|
||||||
|
|
||||||
|
|
||||||
clock: $(MOSTOBJS) $(STRINGOBJS)
|
clock: $(MOSTOBJS) $(STRINGOBJS) $(WINESTUB)
|
||||||
$(CC) -o clock $(MOSTOBJS) $(LDOPTIONS) $(ALL_LIBS) $(STRINGOBJS)
|
$(CC) -o clock $(MOSTOBJS) $(LDOPTIONS) $(ALL_LIBS) $(STRINGOBJS)
|
||||||
|
|
||||||
install: dummy
|
install: dummy
|
||||||
|
|
|
@ -29,7 +29,7 @@ depend:: $(RC_SRCS:.rc=.h)
|
||||||
$(CPP) $(DEFS) $(OPTIONS) $(DIVINCL) -DRC_INVOKED -P -x c $< | $(WRC) $(WRCFLAGS) $(WRCEXTRA) -nH $*.h
|
$(CPP) $(DEFS) $(OPTIONS) $(DIVINCL) -DRC_INVOKED -P -x c $< | $(WRC) $(WRCFLAGS) $(WRCEXTRA) -nH $*.h
|
||||||
|
|
||||||
|
|
||||||
cmdlgtst: $(OBJS)
|
cmdlgtst: $(OBJS) $(WINESTUB)
|
||||||
$(CC) -o cmdlgtst $(OBJS) $(LDOPTIONS) $(ALL_LIBS)
|
$(CC) -o cmdlgtst $(OBJS) $(LDOPTIONS) $(ALL_LIBS)
|
||||||
|
|
||||||
install: dummy
|
install: dummy
|
||||||
|
|
|
@ -13,7 +13,7 @@ all: $(PROGRAMS)
|
||||||
|
|
||||||
@MAKE_RULES@
|
@MAKE_RULES@
|
||||||
|
|
||||||
control: $(OBJS)
|
control: $(OBJS) $(WINESTUB)
|
||||||
$(CC) -o control $(OBJS) $(LDOPTIONS) $(ALL_LIBS)
|
$(CC) -o control $(OBJS) $(LDOPTIONS) $(ALL_LIBS)
|
||||||
|
|
||||||
install: dummy
|
install: dummy
|
||||||
|
|
|
@ -44,7 +44,7 @@ depend::
|
||||||
$(CPP) $(DEFS) $(OPTIONS) $(DIVINCL) -DRC_INVOKED -P -x c $< | $(WRC) $(WRCFLAGS) $(WRCEXTRA) -nH $*.h
|
$(CPP) $(DEFS) $(OPTIONS) $(DIVINCL) -DRC_INVOKED -P -x c $< | $(WRC) $(WRCFLAGS) $(WRCEXTRA) -nH $*.h
|
||||||
|
|
||||||
|
|
||||||
notepad: $(MOSTOBJS) $(STRINGOBJS)
|
notepad: $(MOSTOBJS) $(STRINGOBJS) $(WINESTUB)
|
||||||
$(CC) -o notepad $(MOSTOBJS) $(LDOPTIONS) $(ALL_LIBS) $(STRINGOBJS)
|
$(CC) -o notepad $(MOSTOBJS) $(LDOPTIONS) $(ALL_LIBS) $(STRINGOBJS)
|
||||||
|
|
||||||
install: dummy
|
install: dummy
|
||||||
|
|
|
@ -48,7 +48,7 @@ depend:: $(RC_SRCS:.rc=.h)
|
||||||
$(CPP) $(DEFS) $(OPTIONS) $(DIVINCL) -DRC_INVOKED -P -x c $< | $(WRC) $(WRCFLAGS) $(WRCEXTRA) -nH $*.h
|
$(CPP) $(DEFS) $(OPTIONS) $(DIVINCL) -DRC_INVOKED -P -x c $< | $(WRC) $(WRCFLAGS) $(WRCEXTRA) -nH $*.h
|
||||||
|
|
||||||
|
|
||||||
progman: $(MOSTOBJS) $(STRINGOBJS)
|
progman: $(MOSTOBJS) $(STRINGOBJS) $(WINESTUB)
|
||||||
$(CC) -o progman $(MOSTOBJS) $(LDOPTIONS) $(ALL_LIBS) $(STRINGOBJS)
|
$(CC) -o progman $(MOSTOBJS) $(LDOPTIONS) $(ALL_LIBS) $(STRINGOBJS)
|
||||||
|
|
||||||
install: dummy
|
install: dummy
|
||||||
|
|
|
@ -18,7 +18,7 @@ depend::
|
||||||
|
|
||||||
@MAKE_RULES@
|
@MAKE_RULES@
|
||||||
|
|
||||||
regapi: $(OBJS)
|
regapi: $(OBJS) $(WINESTUB)
|
||||||
$(CC) -o regapi $(OBJS) $(LDOPTIONS) $(ALL_LIBS)
|
$(CC) -o regapi $(OBJS) $(LDOPTIONS) $(ALL_LIBS)
|
||||||
|
|
||||||
install: dummy
|
install: dummy
|
||||||
|
|
|
@ -15,7 +15,7 @@ all: $(PROGRAMS)
|
||||||
|
|
||||||
@MAKE_RULES@
|
@MAKE_RULES@
|
||||||
|
|
||||||
regtest: $(OBJS)
|
regtest: $(OBJS) $(WINESTUB)
|
||||||
$(CC) -o regtest $(OBJS) $(LDOPTIONS) $(ALL_LIBS)
|
$(CC) -o regtest $(OBJS) $(LDOPTIONS) $(ALL_LIBS)
|
||||||
|
|
||||||
install: dummy
|
install: dummy
|
||||||
|
|
|
@ -31,7 +31,7 @@ depend:: $(RC_SRCS:.rc=.h)
|
||||||
$(CPP) $(DEFS) $(OPTIONS) $(DIVINCL) -DRC_INVOKED -P -x c $< | $(WRC) $(WRCFLAGS) $(WRCEXTRA) -nH $*.h
|
$(CPP) $(DEFS) $(OPTIONS) $(DIVINCL) -DRC_INVOKED -P -x c $< | $(WRC) $(WRCFLAGS) $(WRCEXTRA) -nH $*.h
|
||||||
|
|
||||||
|
|
||||||
view: $(OBJS)
|
view: $(OBJS) $(WINESTUB)
|
||||||
$(CC) -o view $(OBJS) $(LDOPTIONS) $(ALL_LIBS)
|
$(CC) -o view $(OBJS) $(LDOPTIONS) $(ALL_LIBS)
|
||||||
|
|
||||||
install: dummy
|
install: dummy
|
||||||
|
|
|
@ -27,7 +27,7 @@ depend:: $(RC_SRCS:.rc=.h)
|
||||||
#this line is needed to prevent winestub.o being linked
|
#this line is needed to prevent winestub.o being linked
|
||||||
WINESTUB =
|
WINESTUB =
|
||||||
|
|
||||||
wcmd: $(OBJS)
|
wcmd: $(OBJS) $(WINESTUB)
|
||||||
$(CC) -o wcmd $(OBJS) $(LDOPTIONS) $(ALL_LIBS)
|
$(CC) -o wcmd $(OBJS) $(LDOPTIONS) $(ALL_LIBS)
|
||||||
|
|
||||||
install: dummy
|
install: dummy
|
||||||
|
|
|
@ -43,7 +43,7 @@ depend:: $(RC_SRCS:.rc=.h) y.tab.h
|
||||||
$(CPP) $(DEFS) $(OPTIONS) $(DIVINCL) -DRC_INVOKED -P -x c $< | $(WRC) $(WRCFLAGS) $(WRCEXTRA) -nH $*.h
|
$(CPP) $(DEFS) $(OPTIONS) $(DIVINCL) -DRC_INVOKED -P -x c $< | $(WRC) $(WRCFLAGS) $(WRCEXTRA) -nH $*.h
|
||||||
|
|
||||||
# Some strings need addresses >= 0x10000
|
# Some strings need addresses >= 0x10000
|
||||||
winhelp: $(MOSTOBJS) $(STRINGOBJS)
|
winhelp: $(MOSTOBJS) $(STRINGOBJS) $(WINESTUB)
|
||||||
$(CC) -o winhelp $(MOSTOBJS) $(LDOPTIONS) $(ALL_LIBS) $(STRINGOBJS)
|
$(CC) -o winhelp $(MOSTOBJS) $(LDOPTIONS) $(ALL_LIBS) $(STRINGOBJS)
|
||||||
|
|
||||||
hlp2sgml: hlp2sgml.o hlpfile.o
|
hlp2sgml: hlp2sgml.o hlpfile.o
|
||||||
|
|
|
@ -15,7 +15,7 @@ all: check_wrc $(PROGRAMS)
|
||||||
|
|
||||||
@MAKE_RULES@
|
@MAKE_RULES@
|
||||||
|
|
||||||
winver: $(OBJS)
|
winver: $(OBJS) $(WINESTUB)
|
||||||
$(CC) -o winver $(OBJS) $(LDOPTIONS) $(ALL_LIBS)
|
$(CC) -o winver $(OBJS) $(LDOPTIONS) $(ALL_LIBS)
|
||||||
|
|
||||||
install: dummy
|
install: dummy
|
||||||
|
|
Loading…
Reference in a new issue