diff options
| -rw-r--r-- | Make.config | 5 | ||||
| -rw-r--r-- | glcddrivers/Makefile | 5 | ||||
| -rw-r--r-- | glcdgraphics/Makefile | 10 | ||||
| -rw-r--r-- | glcdskin/Makefile | 5 | ||||
| -rw-r--r-- | tools/convpic/Makefile | 5 | ||||
| -rw-r--r-- | tools/crtfont/Makefile | 5 | ||||
| -rw-r--r-- | tools/genfont/Makefile | 5 | ||||
| -rw-r--r-- | tools/lcdtestpattern/Makefile | 5 | ||||
| -rw-r--r-- | tools/showpic/Makefile | 5 | ||||
| -rw-r--r-- | tools/showtext/Makefile | 5 |
10 files changed, 14 insertions, 41 deletions
diff --git a/Make.config b/Make.config index 238be3f..29b82ef 100644 --- a/Make.config +++ b/Make.config @@ -10,6 +10,7 @@ CFLAGS = -O2 CXXFLAGS = -g -O2 -Wall -Woverloaded-virtual #CXXFLAGS = -g -ggdb -O0 -Wall -Woverloaded-virtual +CXXFLAGS += -MMD -MP # no CXX given at all: force g++ ifeq (x$(CXX)x,xx) @@ -21,13 +22,11 @@ ifeq ($(CXX),clang++) CXX = clang endif -# set CXXEXTRA and MAKEDEP according to compiler that is used +# set CXXEXTRA according to compiler that is used ifeq ($(CXX),clang) CXXEXTRA = -x c++ -Qunused-arguments - MAKEDEP = clang -x c++ -M -MM -Qunused-arguments else CXXEXTRA = - MAKEDEP = g++ -MM -MG endif #LDFLAGS = -g -ggdb -O0 diff --git a/glcddrivers/Makefile b/glcddrivers/Makefile index 9f70592..b09f468 100644 --- a/glcddrivers/Makefile +++ b/glcddrivers/Makefile @@ -58,10 +58,7 @@ endif # Dependencies: -#MAKEDEP = g++ -MM -MG -DEPFILE = .dependencies -$(DEPFILE): Makefile - @$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@ +DEPFILE = $(OBJS:%.o=%.d) -include $(DEPFILE) diff --git a/glcdgraphics/Makefile b/glcdgraphics/Makefile index 0b7336f..5abbb2b 100644 --- a/glcdgraphics/Makefile +++ b/glcdgraphics/Makefile @@ -36,10 +36,7 @@ HEADERS = bitmap.h font.h glcd.h image.h imagefile.h pbm.h extformats.h # Dependencies: -#MAKEDEP = g++ -MM -MG -DEPFILE = .dependencies -$(DEPFILE): Makefile - @$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@ +DEPFILE = $(OBJS:%.o=%.d) -include $(DEPFILE) @@ -52,8 +49,7 @@ ifdef HAVE_FREETYPE2 LIBS += -lfreetype endif DEFINES += -DHAVE_FREETYPE2 -endif### Targets: - +endif # two ifdef/endif are used because older installations may not support 'else ifdef' ifeq ($(IMAGELIB), imagemagick) @@ -68,6 +64,8 @@ ifeq ($(IMAGELIB), graphicsmagick) endif +### Targets: + all: $(LIBNAME) $(LIBNAME): $(OBJS) diff --git a/glcdskin/Makefile b/glcdskin/Makefile index 7dcee7f..6182986 100644 --- a/glcdskin/Makefile +++ b/glcdskin/Makefile @@ -35,10 +35,7 @@ endif # Dependencies: -#MAKEDEP = g++ -MM -MG -DEPFILE = .dependencies -$(DEPFILE): Makefile - @$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@ +DEPFILE = $(OBJS:%.o=%.d) -include $(DEPFILE) diff --git a/tools/convpic/Makefile b/tools/convpic/Makefile index 6ed0d76..6029d5f 100644 --- a/tools/convpic/Makefile +++ b/tools/convpic/Makefile @@ -22,10 +22,7 @@ all: $(PRGNAME) # Dependencies: -#MAKEDEP = $(CXX) -MM -MG -DEPFILE = .dependencies -$(DEPFILE): Makefile - @$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@ +DEPFILE = $(OBJS:%.o=%.d) -include $(DEPFILE) diff --git a/tools/crtfont/Makefile b/tools/crtfont/Makefile index 8827859..64b1fb6 100644 --- a/tools/crtfont/Makefile +++ b/tools/crtfont/Makefile @@ -21,10 +21,7 @@ all: $(PRGNAME) # Dependencies: -#MAKEDEP = $(CXX) -MM -MG -DEPFILE = .dependencies -$(DEPFILE): Makefile - @$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@ +DEPFILE = $(OBJS:%.o=%.d) -include $(DEPFILE) diff --git a/tools/genfont/Makefile b/tools/genfont/Makefile index d4bd2be..9a699dd 100644 --- a/tools/genfont/Makefile +++ b/tools/genfont/Makefile @@ -24,10 +24,7 @@ all: $(PRGNAME) # Dependencies: -#MAKEDEP = $(CXX) -MM -MG -DEPFILE = .dependencies -$(DEPFILE): Makefile - @$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@ +DEPFILE = $(OBJS:%.o=%.d) -include $(DEPFILE) diff --git a/tools/lcdtestpattern/Makefile b/tools/lcdtestpattern/Makefile index b4dccbf..c004253 100644 --- a/tools/lcdtestpattern/Makefile +++ b/tools/lcdtestpattern/Makefile @@ -22,10 +22,7 @@ all: $(PRGNAME) # Dependencies: -#MAKEDEP = $(CXX) -MM -MG -DEPFILE = .dependencies -$(DEPFILE): Makefile - @$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@ +DEPFILE = $(OBJS:%.o=%.d) -include $(DEPFILE) diff --git a/tools/showpic/Makefile b/tools/showpic/Makefile index dd235e9..e9bc83c 100644 --- a/tools/showpic/Makefile +++ b/tools/showpic/Makefile @@ -22,10 +22,7 @@ all: $(PRGNAME) # Dependencies: -#MAKEDEP = $(CXX) -MM -MG -DEPFILE = .dependencies -$(DEPFILE): Makefile - @$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@ +DEPFILE = $(OBJS:%.o=%.d) -include $(DEPFILE) diff --git a/tools/showtext/Makefile b/tools/showtext/Makefile index dcab7d3..62196aa 100644 --- a/tools/showtext/Makefile +++ b/tools/showtext/Makefile @@ -22,10 +22,7 @@ all: $(PRGNAME) # Dependencies: -#MAKEDEP = $(CXX) -MM -MG -DEPFILE = .dependencies -$(DEPFILE): Makefile - @$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@ +DEPFILE = $(OBJS:%.o=%.d) -include $(DEPFILE) |