1
0
mirror of https://github.com/hsoft/collapseos.git synced 2024-12-24 14:28:06 +11:00

Fix makefile build-from-clean-repo glitches

This commit is contained in:
Virgil Dupras 2020-06-30 10:24:12 -04:00
parent f09aa0603c
commit d97012ecae
4 changed files with 12 additions and 2 deletions

View File

@ -5,6 +5,9 @@ TARGET = classic
.PHONY: all
all: $(TARGET)
../../emul.o:
make -C ../..
$(TARGET): $(OBJS) $(EXTOBJS)
$(CC) $(OBJS) $(EXTOBJS) -o $@

View File

@ -7,6 +7,9 @@ LDFLAGS += `pkg-config --libs xcb`
.PHONY: all
all: $(TARGET)
../../emul.o:
make -C ../..
$(TARGET): $(OBJS) $(EXTOBJS)
$(CC) $(OBJS) $(EXTOBJS) -o $@ $(LDFLAGS)

View File

@ -7,6 +7,9 @@ LDFLAGS += `pkg-config --libs xcb`
.PHONY: all
all: $(TARGET)
../../emul.o:
make -C ../..
$(TARGET): $(OBJS) $(EXTOBJS)
$(CC) $(OBJS) $(EXTOBJS) -o $@ $(LDFLAGS)

View File

@ -1,7 +1,8 @@
TARGET = os.bin
BASEDIR = ../..
CDIR = $(BASEDIR)/cvm
EDIR = $(BASEDIR)/emul
STAGE = $(BASEDIR)/cvm/stage
STAGE = $(CDIR)/stage
EMUL = $(EDIR)/hw/rc2014/classic
.PHONY: all
@ -10,7 +11,7 @@ $(TARGET): xcomp.fs $(STAGE)
cat xcomp.fs | $(STAGE) > $@
$(STAGE):
$(MAKE) -C $(EDIR) stage
$(MAKE) -C $(CDIR) stage
$(EMUL):
$(MAKE) -C ${@:%/classic=%}