Make sure we build tools first.

This commit is contained in:
Alexandre Julliard 1999-07-25 11:28:39 +00:00
parent b5151d003d
commit 609f67153d
1 changed files with 7 additions and 4 deletions

View File

@ -23,9 +23,11 @@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = none MODULE = none
LIBSUBDIRS = \ TOOLSUBDIRS = \
tools \ tools \
tools/wrc \ tools/wrc
LIBSUBDIRS = \
controls \ controls \
console \ console \
dlls/advapi32 \ dlls/advapi32 \
@ -89,6 +91,7 @@ INCSUBDIRS = include
# Sub-directories to run make into # Sub-directories to run make into
BUILDSUBDIRS = \ BUILDSUBDIRS = \
$(TOOLSUBDIRS) \
$(LIBSUBDIRS) \ $(LIBSUBDIRS) \
$(X11SUBDIRS) \ $(X11SUBDIRS) \
$(EMUSUBDIRS) \ $(EMUSUBDIRS) \
@ -181,12 +184,12 @@ wine wine.sym: $(LIB_TARGET) $(EMUOBJS) dummy
nm -n wine | grep -v _compiled >wine.sym nm -n wine | grep -v _compiled >wine.sym
@echo "Wine build complete." @echo "Wine build complete."
libwine.a: $(LIBOBJS) $(X11OBJS) libwine.a: $(TOOLSUBDIRS) $(LIBOBJS) $(X11OBJS)
$(RM) $@ $(RM) $@
$(AR) $@ $(LIBOBJS) $(X11OBJS) $(AR) $@ $(LIBOBJS) $(X11OBJS)
$(RANLIB) $@ $(RANLIB) $@
libwine.so.1.0: $(LIBOBJS) $(X11OBJS) libwine.so.1.0: $(TOOLSUBDIRS) $(LIBOBJS) $(X11OBJS)
$(LDSHARED) -o$@ $(LIBOBJS) $(X11OBJS) $(LDOPTIONS) $(LDSHARED) -o$@ $(LIBOBJS) $(X11OBJS) $(LDOPTIONS)
ln -sf $@ libwine.so ln -sf $@ libwine.so