diff options
| author | mrwastl <mrwastl@users.sourceforge.net> | 2011-06-13 11:52:55 +0200 |
|---|---|---|
| committer | mrwastl <mrwastl@users.sourceforge.net> | 2011-06-13 11:52:55 +0200 |
| commit | 5a1e0240ba2083f96df6237fdeb8ff783ef13fe0 (patch) | |
| tree | 5797ba294cccba596f407e6b0b7446daa0a61282 | |
| parent | 2f10b68a0014894251108e652f48797b62cb475e (diff) | |
| download | graphlcd-base-5a1e0240ba2083f96df6237fdeb8ff783ef13fe0.tar.gz graphlcd-base-5a1e0240ba2083f96df6237fdeb8ff783ef13fe0.tar.bz2 | |
avoid 'else ifdef' to make older installations happy
| -rw-r--r-- | glcdgraphics/Makefile | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/glcdgraphics/Makefile b/glcdgraphics/Makefile index 3e6cd1a..27f6b33 100644 --- a/glcdgraphics/Makefile +++ b/glcdgraphics/Makefile @@ -5,11 +5,13 @@ -include ../Make.config # External image lib to use: imagemagick, graphicsmagick, or none +# (two ifdef/endif are used because older installations may not support 'else ifdef') IMAGELIB = +ifdef HAVE_GRAPHICSMAGICK + IMAGELIB = graphicsmagick +endif ifdef HAVE_IMAGEMAGICK IMAGELIB = imagemagick -else ifdef HAVE_GRAPHICSMAGICK - IMAGELIB = graphicsmagick endif @@ -53,11 +55,13 @@ ifdef HAVE_FREETYPE2 endif### Targets: +# two ifdef/endif are used because older installations may not support 'else ifdef' ifeq ($(IMAGELIB), imagemagick) DEFINES += -DHAVE_IMAGEMAGICK INCLUDES += $(shell pkg-config --cflags ImageMagick++) LIBS += $(shell pkg-config --libs ImageMagick++) -else ifeq ($(IMAGELIB), graphicsmagick) +endif +ifeq ($(IMAGELIB), graphicsmagick) DEFINES += -DHAVE_IMAGEMAGICK # yep, really HAVE_IMAGEMAGICK here INCLUDES += $(shell pkg-config --cflags GraphicsMagick++) LIBS += $(shell pkg-config --libs GraphicsMagick++) |