summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Kaivo <jkk@xcc.kaivo.net>2018-11-13 20:27:51 -0500
committerJakob Kaivo <jkk@xcc.kaivo.net>2018-11-13 20:27:51 -0500
commit004ac73b61874ec69ce2395fdc99694b0b32953c (patch)
treeacadf42a8c6791a8762e07b592bd9b7c420660d8
parent43d7600d4415b3d4895628231576a3ae9f24e7c9 (diff)
remove recursive dependency building
-rw-r--r--Makefile16
1 files changed, 5 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index 9633fad..7f9cb95 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,12 @@
CROSS=arm-linux-gnueabihf
DEPLIBS=MagickCore libpng16 zlib
-PKGCONFIG=PKG_CONFIG_PATH=/usr/$(CROSS)/lib/pkgconfig pkg-config
+PKG_CONFIG_PATH=./deps/lib/pkgconfig
CC=$(CROSS)-gcc
-CFLAGS=-Wall -Wextra -I. $$($(PKGCONFIG) --cflags MagickCore)
-LDFLAGS=-lpthread $$($(PKGCONFIG) --libs-only-L $(DEPLIBS))
-LDLIBS=$$($(PKGCONFIG) --libs-only-l $(DEPLIBS)) -lm
+CFLAGS=-Wall -Wextra -I. $$(PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --cflags MagickCore)
+LDFLAGS=-lpthread $$(PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --libs-only-L $(DEPLIBS))
+LDLIBS=$$(PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --libs-only-l $(DEPLIBS)) -lm
-all: install-deps freeonebook
+all: freeonebook
freeonebook: freeonebook.o gpio.o fb.o convert.o
@@ -20,9 +20,3 @@ convert.o: convert.c convert.h
clean:
rm -f freeonebook *.o
-
-install-deps: deps.installed
-
-deps.installed:
- cd deps; $(MAKE) all
- touch $@