From 2630860e6bc935c3daacec186e080eddcc79fe3c Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Thu, 11 Apr 2013 14:45:26 +0200 Subject: Added Makefile targets for 'disabled'. Fix some bugs accordingly. --- Makefile | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 7e35afa..c687d76 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ include Makefile.files CFLAGS=-Werror -Wall -D_FORTIFY_SOURCE=2 -g -O2 CXXFLAGS=$(CFLAGS) -all: complete obj simple syslog filter mutex minimal +all: complete obj simple syslog filter mutex minimal disabled complete: gcc ${CFLAGS} ${HUGIN_SOURCES} main_complete.c -o hugin-complete -DWITH_HUG_SYSLOG -DWITH_HUG_FILTER -DWITH_HUG_MUTEX @@ -29,16 +29,32 @@ minimal: g++ ${CXXFLAGS} hugin.c main_minimal.c -o hugin-minimal syslog: - gcc ${CFLAGS} hugin.c hugin_syslog.c main_syslog.c -o hugin-syslog -DWITH_HUG_SYSLOG - g++ ${CXXFLAGS} hugin.c hugin_syslog.c main_syslog.c -o hugin-syslog -DWITH_HUG_SYSLOG + gcc ${CFLAGS} hugin.c hugin_syslog.c main_syslog.c \ + -o hugin-syslog -DWITH_HUG_SYSLOG + g++ ${CXXFLAGS} hugin.c hugin_syslog.c main_syslog.c \ + -o hugin-syslog -DWITH_HUG_SYSLOG filter: - gcc ${CFLAGS} hugin.c hugin_filter.c main_filter.c -o hugin-filter -DWITH_HUG_FILTER - g++ ${CXXFLAGS} hugin.c hugin_filter.c main_filter.c -o hugin-filter -DWITH_HUG_FILTER + gcc ${CFLAGS} hugin.c hugin_filter.c main_filter.c -o hugin-filter \ + -DWITH_HUG_FILTER + g++ ${CXXFLAGS} hugin.c hugin_filter.c main_filter.c -o hugin-filter \ + -DWITH_HUG_FILTER mutex: gcc ${CFLAGS} hugin.c main_mutex.c -o hugin-mutex -DWITH_HUG_MUTEX g++ ${CXXFLAGS} hugin.c main_mutex.c -o hugin-mutex -DWITH_HUG_MUTEX +disabled: + gcc -DDISABLE_HUGIN ${CFLAGS} hugin.c main_simple.c \ + -o hugin-simple-disabled + g++ -DDISABLE_HUGIN ${CXXFLAGS} hugin.c main_simple.c \ + -o hugin-simple-disabled + gcc -DDISABLE_HUGIN ${CFLAGS} ${HUGIN_SOURCES} main_complete.c \ + -o hugin-complete-disabled -DWITH_HUG_SYSLOG -DWITH_HUG_FILTER \ + -DWITH_HUG_MUTEX + g++ -DDISABLE_HUGIN ${CXXFLAGS} ${HUGIN_SOURCES} main_complete.c \ + -o hugin-complete-disabled -DWITH_HUG_SYSLOG -DWITH_HUG_FILTER \ + -DWITH_HUG_MUTEX + clean: rm -f hugin_{complete,complete-cpp,simple,syslog,filter,mutex,minimal} \ No newline at end of file -- cgit v1.2.3