Created
July 24, 2012 01:29
-
-
Save oldpatricka/3167362 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Index: src/Linux/Makefile | |
=================================================================== | |
--- src/Linux/Makefile (revision 317) | |
+++ src/Linux/Makefile (working copy) | |
@@ -15,10 +15,6 @@ | |
ifeq ($(JSON),) | |
JSON=yes | |
endif | |
-ifeq ($(JSON),yes) | |
- CFLAGS+=-DHSF_JSON | |
- LIBS+= -lm | |
-endif | |
# if LVRT is not set, then assume it should be "yes" if we find the /usr/lib/libvirt.so library. Maybe | |
# it would be stronger to test for the libvirt-devel rpm? or look for /usr/include/libvirt/libvirt.h? | |
@@ -121,6 +117,11 @@ | |
CFLAGS+= -I. -I$(SFLOWDIR) -I$(JSONDIR) $(OPT) -Wall -D_GNU_SOURCE -DHSP_VERSION=$(VERSION) -DUTHEAP | |
LIBS+= $(SFLOWDIR)/libsflow.a $(JSONDIR)/libjson.a -lresolv -lpthread | |
+ifeq ($(JSON),yes) | |
+ CFLAGS+=-DHSF_JSON | |
+ LIBS+= -lm | |
+endif | |
+ | |
#### BUILD #### | |
all: hsflowd sflowovsd |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment