More makefile updates

This commit is contained in:
inmarket 2014-09-26 18:08:49 +10:00
parent 1298e3d635
commit 8926f56bab
3 changed files with 22 additions and 3 deletions

View File

@ -107,6 +107,10 @@ ifeq ($(MAKECMDGOALS),Debug)
BUILDDIR = bin/Debug
else ifeq ($(MAKECMDGOALS),Release)
BUILDDIR = bin/Release
else ifeq ($(MAKECMDGOALS),cleanDebug)
BUILDDIR = bin/Debug
else ifeq ($(MAKECMDGOALS),cleanRelease)
BUILDDIR = bin/Release
else ifeq ($(BUILDDIR),)
BUILDDIR = .build
else ifeq ($(BUILDDIR),.)
@ -158,6 +162,10 @@ CPFLAGS += -MD -MP -MF $(DEPDIR)/$(@F).d
# makefile rules
#
Debug Release: all
cleanDebug cleanRelease: clean
all: $(BUILDDIR) $(OBJS) $(PROJECT)
$(BUILDDIR) $(OBJDIR) $(LSTDIR) $(MAPDIR):
@ -201,7 +209,7 @@ gcov:
-mv *.gcov ./gcov
clean:
-rm -f $(BUILDDIR)
-rm -fR $(BUILDDIR)
-rm -fR $(DEPDIR)
#

View File

@ -107,6 +107,10 @@ ifeq ($(MAKECMDGOALS),Debug)
BUILDDIR = bin/Debug
else ifeq ($(MAKECMDGOALS),Release)
BUILDDIR = bin/Release
else ifeq ($(MAKECMDGOALS),cleanDebug)
BUILDDIR = bin/Debug
else ifeq ($(MAKECMDGOALS),cleanRelease)
BUILDDIR = bin/Release
else ifeq ($(BUILDDIR),)
BUILDDIR = .build
else ifeq ($(BUILDDIR),.)
@ -158,6 +162,10 @@ CPFLAGS += -MD -MP -MF $(DEPDIR)/$(@F).d
# makefile rules
#
Debug Release: all
cleanDebug cleanRelease: clean
all: $(BUILDDIR) $(OBJS) $(PROJECT)
$(BUILDDIR) $(OBJDIR) $(LSTDIR) $(MAPDIR):
@ -201,7 +209,7 @@ gcov:
-mv *.gcov ./gcov
clean:
-rm -f $(BUILDDIR)
-rm -fR $(BUILDDIR)
-rm -fR $(DEPDIR)
#

View File

@ -132,6 +132,10 @@ ifeq ($(MAKECMDGOALS),Debug)
BUILDDIR = bin/Debug
else ifeq ($(MAKECMDGOALS),Release)
BUILDDIR = bin/Release
else ifeq ($(MAKECMDGOALS),cleanDebug)
BUILDDIR = bin/Debug
else ifeq ($(MAKECMDGOALS),cleanRelease)
BUILDDIR = bin/Release
else ifeq ($(BUILDDIR),)
BUILDDIR = .build
else ifeq ($(BUILDDIR),.)
@ -168,7 +172,6 @@ CPFLAGS += -MD -MP -MF $(DEPDIR)/$(@F).d
Debug Release: all
cleanDebug cleanRelease: clean
-rm -fR bin
all: $(BUILDDIR) $(OBJS) $(BUILDDIR)/$(PROJECT).exe MAKE_ALL_RULE_HOOK
#all: main.cp