Commit b77658bf authored by 's avatar
Browse files

Fixed WITH_ANONYMIZATION flag (anonymization was compiled even if it was set

to 0)


git-svn-id: file:///home/svn/mapi/trunk@254 8d5bb341-7cf1-0310-8cf6-ba355fef3186
parent 2b300c9a
......@@ -4,7 +4,7 @@ INCLUDE=-I. -I$(DAG_INCLUDE_DIR)
CFLAGS=-g -O2 $(C_WARNINGS) $(C_FEATURES)
TARGETS= mapi.so mapid build_tests build_dmapi_tests build_agent mapinicdrv.so mapinicdrv_buf.so mapidstdflib.so anonlib.so flist.o list.o parseconf.o priorities.o $(ADMCTRLCL_TARGETS)
TARGETS= mapi.so mapid build_tests build_dmapi_tests build_agent mapinicdrv.so mapinicdrv_buf.so mapidstdflib.so flist.o list.o parseconf.o priorities.o $(ADMCTRLCL_TARGETS)
.PHONY: build_stdlib build_anonlib build_combo6lib build_daglib build_ipfixlib build_etherlib
......@@ -33,8 +33,10 @@ ifeq ($(WITH_ETHEREAL),1)
ETHEREAL_TARGETS=etherflib.so
endif
ANONYMIZATION_TARGETS=
ifeq ($(WITH_ANONYMIZATION),1)
CFLAGS := $(CFLAGS) -DWITH_ANONYMIZATION
ANONYMIZATION_TARGETS=anonlib.so
endif
ifeq ($(WITH_PRIORITIES),1)
......@@ -43,7 +45,7 @@ else
CFLAGS := $(CFLAGS) -DDEBUG=$(DEBUG) $(INCLUDE) -DWITH_FUNCT_STATS -DWITH_MODIFY_PKTS -DPRIORITIES=$(PRIORITIES)
endif
all: $(TARGETS) $(DAG) $(COMBOSIX) $(IPFIX_TARGETS) $(ETHEREAL_TARGETS)
all: $(TARGETS) $(DAG) $(COMBOSIX) $(IPFIX_TARGETS) $(ETHEREAL_TARGETS) $(ANONYMIZATION_TARGETS)
mapi.o: mapi.c mapi.h mapiipc.h mapidlib.h mapid.h mapidrv.h mapi_errors.h mapierror.h mapidflib.h parseconf.c $(ADMCTRL_BYTESTREAM_H)
$(CC) $(CFLAGS) $(KEYNOTE_CFLAGS) $(ADMCTRLCL_CFLAGS) -fPIC -c $<
......@@ -173,6 +175,7 @@ clean:
cd tests && make clean
cd dmapi_tests && make clean
cd agent && make clean
cd anonymization && make clean
install: all
./$(MKINSTALLDIRS) $(INSTALL_BINDIR)
......@@ -191,7 +194,6 @@ install: all
$(INSTALL) mapi.so $(INSTALL_LIBDIR)
$(INSTALL) mapinicdrv.so $(INSTALL_LIBDIR)
$(INSTALL) mapidstdflib.so $(INSTALL_LIBDIR)
$(INSTALL) anonlib.so $(INSTALL_LIBDIR)
ifeq ($(WITH_DAG),1)
$(INSTALL) dagflib.so $(INSTALL_LIBDIR)
$(INSTALL) mapidagdrv.so $(INSTALL_LIBDIR)
......@@ -205,5 +207,8 @@ ifeq ($(WITH_IPFIX),1)
endif
ifeq ($(WITH_ETHEREAL),1)
$(INSTALL) etherflib.so $(INSTALL_LIBDIR)
endif
ifeq ($(WITH_ANONYMIZATION),1)
$(INSTALL) anonlib.so $(INSTALL_LIBDIR)
endif
cd stdlib && make install
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment