diff options
| author | Bent Bisballe Nyeng <deva@aasimon.org> | 2013-04-11 14:45:26 +0200 | 
|---|---|---|
| committer | Bent Bisballe Nyeng <deva@aasimon.org> | 2013-04-11 14:45:26 +0200 | 
| commit | 2630860e6bc935c3daacec186e080eddcc79fe3c (patch) | |
| tree | 23705f895e571f8445b0a7d3450402e8cdfa5586 /Makefile | |
| parent | 4a06d163403c729da246fceecabf2348ef532140 (diff) | |
Added Makefile targets for 'disabled'. Fix some bugs accordingly.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 26 | 
1 files changed, 21 insertions, 5 deletions
| @@ -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 | 
