Changes to use commands from variables.
This commit is contained in:
parent
7350b11001
commit
fb5b69ae5c
|
@ -5,7 +5,8 @@ srcdir := $(if $(srcdir),$(srcdir),$(project_dir)/build)
|
||||||
|
|
||||||
CXX = c++
|
CXX = c++
|
||||||
CPPFLAGS = -g -O2 -std=c++11 -Wno-switch
|
CPPFLAGS = -g -O2 -std=c++11 -Wno-switch
|
||||||
|
SED = /usr/bin/sed
|
||||||
|
|
||||||
$(shell mkdir -p $(project_dir)/bin)
|
$(shell mkdir -p $(project_dir)/bin)
|
||||||
|
|
||||||
ifdef WINDIR
|
ifdef WINDIR
|
||||||
|
@ -29,10 +30,11 @@ endif
|
||||||
@$(CXX) -c $(CPPFLAGS) $< -o $(srcdir)/$@
|
@$(CXX) -c $(CPPFLAGS) $< -o $(srcdir)/$@
|
||||||
|
|
||||||
%.d: $(project_dir)/oscar64/%.cpp
|
%.d: $(project_dir)/oscar64/%.cpp
|
||||||
@set -e; rm -f $(srcdir)/$@; \
|
@echo "Transforming file" $@ "..."
|
||||||
|
@set -e; $(RM) $(srcdir)/$@; \
|
||||||
$(CC) -MM $(CPPFLAGS) $< > $(srcdir)/$@.$$$$; \
|
$(CC) -MM $(CPPFLAGS) $< > $(srcdir)/$@.$$$$; \
|
||||||
sed 's,\($*\)\.o[ :]*,\1.o $(srcdir)/$@ : ,g' < $(srcdir)/$@.$$$$ > $(srcdir)/$@; \
|
$(SED) 's,\($*\)\.o[ :]*,\1.o $(srcdir)/$@ : ,g' < $(srcdir)/$@.$$$$ > $(srcdir)/$@; \
|
||||||
rm -f $(srcdir)/$@.$$$$
|
$(RM) $(srcdir)/$@.$$$$
|
||||||
|
|
||||||
$(project_dir)/bin/oscar64 : $(objects)
|
$(project_dir)/bin/oscar64 : $(objects)
|
||||||
@echo "Linking compiler" $@ "..."
|
@echo "Linking compiler" $@ "..."
|
||||||
|
@ -40,7 +42,9 @@ $(project_dir)/bin/oscar64 : $(objects)
|
||||||
|
|
||||||
.PHONY : clean
|
.PHONY : clean
|
||||||
clean :
|
clean :
|
||||||
-rm *.o *.d $(project_dir)/bin/oscar64
|
@$(RM) $(srcdir)/*.o
|
||||||
|
@$(RM) $(srcdir)/*.d
|
||||||
|
@$(RM) $(project_dir)/bin/oscar64
|
||||||
|
|
||||||
ifeq ($(UNAME_S), Darwin)
|
ifeq ($(UNAME_S), Darwin)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue