commit ce88f9230b2f1f1634a608da72086304f3afe423
author Mike Frysinger <vapier@chromium.org> Tue Apr 23 00:50:08 2013
committer ChromeBot <chrome-bot@google.com> Tue Apr 23 17:39:07 2013
tree 61eecf51abab2de5d3efaf02a4e9d4d53dc77dc3
parent 7cc3c6fd96721a6ee551838111550d73bd30d785

allow for out-of-tree builds

This adds a few missing build vars to the compile and makes it
so the code can be compiled out-of-tree.

BUG=None
TEST=`emerge-x86-alex ply-image` still works

Change-Id: Ifbec0b8706523c6ec61751f20d8fc874f76c97bb
Reviewed-on: https://gerrit.chromium.org/gerrit/48858
Reviewed-by: Daniel Erat <derat@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>

Makefile

diff --git a/Makefile b/Makefile
index 2f5479b..9d803c1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,3 @@
-all: ply-image
-
-ply-image:
-	$(MAKE) -C src $@
-
-clean:
+all:
+%:
 	$(MAKE) -C src $@

src/Makefile

diff --git a/src/Makefile b/src/Makefile
index 5c1b3f3..f7d7f26 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -5,7 +5,6 @@
     ply-list.c \
     ply-monitor.c
 
-
 H = ply-frame-buffer.h \
     ply-gamma.h \
     ply-kms.h \
@@ -13,11 +12,19 @@
     ply-monitor.h \
     ply-utils.h
 
-CFLAGS ?= -O2
-PKG_CONFIG ?= pkg-config
+SRC ?= .
+OUT ?= .
+VPATH = $(SRC)
 
-ply-image: $(C) $(H) Makefile
-	$(CC) $(CFLAGS) $(C) $(LIBS) -Wall -I. -o ply-image -o ply-image \
+CFLAGS ?= -O2
+CFLAGS += -Wall
+PKG_CONFIG ?= pkg-config
+CPPFLAGS += -I$(SRC)
+
+all: $(OUT)/ply-image
+
+$(OUT)/ply-image: $(C) $(H) Makefile
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(C) -o $@ \
 		-lpng -lrt -lm `$(PKG_CONFIG) --libs --cflags libdrm`
 
 clean: