m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Makefile for building with RECOIL + update Makefile.dep

Browse Source 
it was failing when building with make -j3
This commit is contained in:
Thomas Bernard
2018-03-02 22:48:03 +01:00
parent d9ca8c044b
commit 49bc467358
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Makefile
View File

@@ -723,12 +723,18 @@ $(OBJDIR)/versiontag: pversion.c $(REVISION_CACHE)
RES := $(shell if [ ! -f $(CFLAGS_CACHE) ] || [ "`cat $(CFLAGS_CACHE)`" != "$(COPT) $(CFLAGS)" ] ; then echo "$(COPT) $(CFLAGS)" > $(CFLAGS_CACHE) ; fi )
ifndef NORECOIL
recoil.c: ../3rdparty/recoil-$(RECOILVER)/recoil.c
$(CP) $< $@
$(CP) $(subst .c,.h,$< $@)
recoil.h: recoil.c
$(OBJDIR)/loadrecoil.o: recoil.c recoil.h
../3rdparty/recoil-$(RECOILVER)/recoil.c:
$(MAKE) -C ../3rdparty recoil
endif
$(OBJ): $(CFLAGS_CACHE)
@@ -753,8 +759,9 @@ $(OBJDIR)/haiku.o : haiku.cpp
clean :
$(DELCOMMAND) $(OBJ)
$(DELCOMMAND) $(OBJDOR)/versiontag
$(DELCOMMAND) $(OBJDIR)/versiontag
$(DELCOMMAND) $(BIN)
$(DELCOMMAND) recoil.c recoil.h
ifneq ($(PLATFORM),amiga-vbcc)
# Linux installation of the program