diff options
| author | Daniel Borkmann <dborkman@redhat.com> | 2013-05-13 13:53:27 +0200 |
|---|---|---|
| committer | Daniel Borkmann <dborkman@redhat.com> | 2013-05-13 15:10:16 +0200 |
| commit | d0009856814c13d13770db5aadd7b2fabf947776 (patch) | |
| tree | 6d18a94439f27f3c2685f05c57435116673f40cc /Makefile | |
| parent | 2b100f7515dbd01032967c2d1b81d2f8d63bf9b5 (diff) | |
staging: add mausezahn staging directory
After some back and forth, we decided that it is easier to maintain
mausezahn in a staging directory until it is fully reworked and
cleaned up to be ready to be fully integrated. This way, it is better
than having it in a separate branch, and we can also accept patches
from outside more easily. Also, while at it, fix up some function
mismatches with libcli.
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -8,7 +8,7 @@ SUBLEVEL = 8 EXTRAVERSION = -rc0 NAME = Ziggomatic -TOOLS ?= netsniff-ng trafgen astraceroute flowtop ifpps bpfc curvetun +TOOLS ?= netsniff-ng trafgen astraceroute flowtop ifpps bpfc curvetun mausezahn # For packaging purposes, prefix can define a different path. PREFIX ?= @@ -210,7 +210,7 @@ define TOOL_templ $(1)/%.tab.o: $(1)/%.tab.c $$(CC) $$(ALL_CFLAGS) -o $$@ -c $$< $(1)/%.o: %.c - $$(CC) $$(ALL_CFLAGS) -o $$@ -c $$< + $$(CC) $$(ALL_CFLAGS) -o $(1)/$$(shell basename $$@) -c $$< endef $(foreach tool,$(TOOLS),$(eval $(call TOOL_templ,$(tool)))) @@ -224,6 +224,8 @@ flowtop: ALL_CFLAGS += $(shell pkg-config --cflags ncurses) bpfc: ALL_CFLAGS += -I.. curvetun: ALL_CFLAGS += -I ${NACL_INC_DIR} curvetun: ALL_LDFLAGS += -L ${NACL_LIB_DIR} +# This gets some extra treatment here until the code looks properly +mausezahn: ALL_CFLAGS = -O2 -I. -I.. -DVERSION_STRING=\"$(VERSION_STRING)\" -DPREFIX_STRING=\"$(PREFIX)\" bpfc_clean_custom: $(Q)$(call RM,$(BUILD_DIR)/*.h $(BUILD_DIR)/*.c) @@ -302,6 +304,7 @@ help: $(Q)echo "$(bold)Targets for building the toolkit:$(normal)" $(Q)echo " all|toolkit - Build the whole toolkit" $(Q)echo " allbutcurvetun - Build all except curvetun" + $(Q)echo " allbutmausezahn - Build all except mausezahn" $(Q)echo " <toolname> - Build only one of the tools" $(Q)echo "$(bold)Targets for cleaning the toolkit's build files:$(normal)" $(Q)echo " clean|mostlyclean - Remove all build files" |