aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormutantturkey <mutantturke@gmail.com>2012-07-06 17:36:46 -0400
committermutantturkey <mutantturke@gmail.com>2012-07-06 17:36:46 -0400
commite34eef18f7d273f21d4b3bbad6e6233e8de39f0c (patch)
treee0fc3fdc6c8b8a97124a3e322b7c8e7fa29a0af8
parent8d7f42078ecf016fd5f8d4e212aa2d2eb308e586 (diff)
update the Makefile
-rw-r--r--fly-tools/Makefile21
1 files changed, 12 insertions, 9 deletions
diff --git a/fly-tools/Makefile b/fly-tools/Makefile
index d564f55..2fa6b21 100644
--- a/fly-tools/Makefile
+++ b/fly-tools/Makefile
@@ -1,19 +1,22 @@
CPPC = g++
CC = gcc
-CPPFLAGS = -O2 -Wall -s $(shell pkg-config --cflags --libs ImageMagick++ gsl)
-CFLAGS = -O2 -Wall -s $(shell pkg-config --cflags --libs MagickWand )
+CFLAGS= -O2 -Wall -s
+CPPFLAGS= -O2 -Wall -s
+MAGICKCPPFLAGS = $(shell pkg-config --cflags --libs ImageMagick++ gsl)
+MAGICKCFLAGS = $(shell pkg-config --cflags --libs MagickWand )
-all: FilterFlyMask FlyTrackingMain mask-generator derive-background
+all: FilterFlyMask FlyTrackingMain mask-generator derive-background standard-deviation
derive-background:
- $(CC) background/main.c -std=c99 -o derive-background $(CFLAGS)
+ $(CC) background/main.c -std=c99 -o derive-background $(CFLAGS) $(MAGICKCFLAGS)
mask-generator:
- $(CC) mask/main.c mask/thpool.c -I./mask/ -o mask-generator $(CFLAGS) -pthread
+ $(CC) mask/main.c mask/thpool.c -I./mask/ -o mask-generator $(CFLAGS) $(MAGICKCFLAGS) -pthread
+standard-deviation:
+ $(CPPC) standard-deviation/StandardDeviation.cpp -o standard-deviation $(CPPFLAGS)
FlyTrackingMain:
- $(CPPC) FlyTrackingMain.cpp FlyObject.cpp FrameInfo.cpp -o FlyTracking $(CPPFLAGS)
-
+ $(CPPC) FlyTrackingMain.cpp FlyObject.cpp FrameInfo.cpp -o FlyTracking $(CPPFLAGS) $(MAGICKCPPFLAGS)
FilterFlyMask:
- $(CPPC) FilterFlyMask.cpp FlyObject.cpp FrameInfo.cpp -o FilterFlyMask $(CPPFLAGS)
+ $(CPPC) FilterFlyMask.cpp FlyObject.cpp FrameInfo.cpp -o FilterFlyMask $(CPPFLAGS) $(MAGICKCPPFLAGS)
clean:
- rm -vf FilterFlyMask FlyTracking mask-generator
+ rm -vf FilterFlyMask FlyTracking mask-generator derive-background standard-deviation