izaya/collapseos
1
0
Fork 0
mirror of https://github.com/hsoft/collapseos.git synced 2024-11-23 19:38:05 +11:00
Code Issues Releases Wiki Activity

Fix makefile build-from-clean-repo glitches

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
emul/hw/rc2014/Makefile
View File

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

3
emul/hw/sms/Makefile
View File

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

3
emul/hw/ti/Makefile
View File

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

5
recipes/rc2014/Makefile
View File

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