Commit 86f8a668 authored by Mike Hibler's avatar Mike Hibler

Fix up the ordering of include paths to get the correct event.h.

If the libevent package is installed, there will be /usr/local/include/event.h
which conflicted with our event.h in the clientside/lib/event directory.
parent 242ef94f
# #
# Copyright (c) 2000-2011 University of Utah and the Flux Group. # Copyright (c) 2000-2014 University of Utah and the Flux Group.
# #
# {{{EMULAB-LICENSE # {{{EMULAB-LICENSE
# #
...@@ -32,7 +32,7 @@ CDPROGS = canaryd alertlistener ...@@ -32,7 +32,7 @@ CDPROGS = canaryd alertlistener
include $(OBJDIR)/Makeconf include $(OBJDIR)/Makeconf
CC?=gcc CC?=gcc
CFLAGS+= -Wall -g -I${OBJDIR} -I/usr/local/include \ CFLAGS+= -Wall -g -I${OBJDIR} \
-I$(TESTBED_LIBSRCDIR)/libtb \ -I$(TESTBED_LIBSRCDIR)/libtb \
-I$(TESTBED_LIBSRCDIR)/event \ -I$(TESTBED_LIBSRCDIR)/event \
-DCLIENT_BINDIR='"$(CLIENT_BINDIR)"' \ -DCLIENT_BINDIR='"$(CLIENT_BINDIR)"' \
......
# #
# Copyright (c) 2000-2011 University of Utah and the Flux Group. # Copyright (c) 2000-2014 University of Utah and the Flux Group.
# #
# {{{EMULAB-LICENSE # {{{EMULAB-LICENSE
# #
...@@ -48,9 +48,10 @@ LDFLAGS += $(LDSTATIC) ...@@ -48,9 +48,10 @@ LDFLAGS += $(LDSTATIC)
DBLIBS = -L/usr/local/lib/mysql -lmysqlclient -lz DBLIBS = -L/usr/local/lib/mysql -lmysqlclient -lz
LIBS += -lpthread -levent_r -ltb -lz LIBS += -lpthread -levent_r -ltb -lz
XMLRPCINC = `xmlrpc-c-config c++2 client --cflags` CXXFLAGS += -pthread -O -I$(OBJDIR)
CXXFLAGS += -pthread -O $(XMLRPCINC) -I$(OBJDIR)
CXXFLAGS += -I$(TESTBED_LIBSRCDIR)/event -I$(TESTBED_LIBSRCDIR)/libtb CXXFLAGS += -I$(TESTBED_LIBSRCDIR)/event -I$(TESTBED_LIBSRCDIR)/libtb
XMLRPCINC = `xmlrpc-c-config c++2 client --cflags`
CXXFLAGS += $(XMLRPCINC)
XMLRPCLIBS = `xmlrpc-c-config c++2 client --libs` XMLRPCLIBS = `xmlrpc-c-config c++2 client --libs`
# #
......
# #
# Copyright (c) 2000-2011 University of Utah and the Flux Group. # Copyright (c) 2000-2014 University of Utah and the Flux Group.
# #
# {{{EMULAB-LICENSE # {{{EMULAB-LICENSE
# #
...@@ -46,9 +46,11 @@ LDFLAGS += $(LDSTATIC) ...@@ -46,9 +46,11 @@ LDFLAGS += $(LDSTATIC)
DBLIBS = -L/usr/local/lib/mysql -lmysqlclient -lz DBLIBS = -L/usr/local/lib/mysql -lmysqlclient -lz
LIBS += -levent_r -ltb -lz LIBS += -levent_r -ltb -lz
ULXRINC = -I/usr/local/include -I/usr/local/include/ulxmlrpcpp
CXXFLAGS += -pthread -O $(ULXRINC) -I$(OBJDIR) -I$(TESTBED_LIBSRCDIR)/libtb CXXFLAGS += -pthread -O -I$(OBJDIR) -I$(TESTBED_LIBSRCDIR)/libtb
CXXFLAGS += -I$(TESTBED_LIBSRCDIR)/event CXXFLAGS += -I$(TESTBED_LIBSRCDIR)/event
ULXRINC = -I/usr/local/include -I/usr/local/include/ulxmlrpcpp
CXXFLAGS += $(ULXRINC)
ULXRLIBS = -L/usr/local/lib -lulsshxmlrpcpp -lulxmlrpcpp -lexpat ULXRLIBS = -L/usr/local/lib -lulsshxmlrpcpp -lulxmlrpcpp -lexpat
# #
......
# #
# Copyright (c) 2000-2012 University of Utah and the Flux Group. # Copyright (c) 2000-2014 University of Utah and the Flux Group.
# #
# {{{EMULAB-LICENSE # {{{EMULAB-LICENSE
# #
...@@ -43,7 +43,12 @@ DBFLAG = -DUSE_MYSQL_DB ...@@ -43,7 +43,12 @@ DBFLAG = -DUSE_MYSQL_DB
BI_DBSRC = bootinfo_null.c bootinfo_cfile.c bootinfo_mysql.c BI_DBSRC = bootinfo_null.c bootinfo_cfile.c bootinfo_mysql.c
BI_DBOBJ = bootinfo_null.o bootinfo_cfile.o bootinfo_mysql.o BI_DBOBJ = bootinfo_null.o bootinfo_cfile.o bootinfo_mysql.o
INCS = -I${OBJDIR} -I/usr/local/include -I$(TESTBED_LIBSRCDIR)/libtb INCS = -I${OBJDIR}
ifeq ($(EVENTSYS),1)
# XXX eventdir must be included before /usr/local/include for event.h
INCS += -I$(TESTBED_LIBSRCDIR)/event
endif
INCS += -I$(TESTBED_LIBSRCDIR)/libtb -I/usr/local/include
CFLAGS += -Wall \ CFLAGS += -Wall \
$(INCS) $(DBFLAG) -DSOLARIS -DHAVE_SOCKADDR_SA_LEN -DUSE_RECVMSG \ $(INCS) $(DBFLAG) -DSOLARIS -DHAVE_SOCKADDR_SA_LEN -DUSE_RECVMSG \
...@@ -58,7 +63,7 @@ ifeq ($(EVENTSYS),1) ...@@ -58,7 +63,7 @@ ifeq ($(EVENTSYS),1)
BI_DBSRC += event-support.c BI_DBSRC += event-support.c
BI_DBOBJ += event-support.o BI_DBOBJ += event-support.o
CFLAGS += -DEVENTSYS -I$(TESTBED_LIBSRCDIR)/event -I/usr/local/include CFLAGS += -DEVENTSYS
LFLAGS += $(TESTBED_LIBOBJDIR)/event/libevent.a LFLAGS += $(TESTBED_LIBOBJDIR)/event/libevent.a
LFLAGS += -L/usr/local/lib -lpubsub -lcrypto LFLAGS += -L/usr/local/lib -lpubsub -lcrypto
endif endif
......
# #
# Copyright (c) 2000-2011 , 2012University of Utah and the Flux Group. # Copyright (c) 2000-2014 University of Utah and the Flux Group.
# #
# {{{EMULAB-LICENSE # {{{EMULAB-LICENSE
# #
...@@ -72,13 +72,13 @@ TMLIBS += -ldl ...@@ -72,13 +72,13 @@ TMLIBS += -ldl
endif endif
ifeq ($(EVENTSYS),1) ifeq ($(EVENTSYS),1)
TMCDCFLAGS = -I$(TESTBED_LIBSRCDIR)/event -DEVENTSYS TMCDCFLAGS = -I$(TESTBED_LIBSRCDIR)/event -DEVENTSYS
TMCDLIBS = ${TESTBED_LIBOBJDIR}/event/libevent.a TMCDLIBS = ${TESTBED_LIBOBJDIR}/event/libevent.a
ELVINFLAGS = -lm -L/usr/local/lib -lpubsub ELVINFLAGS = -lm -L/usr/local/lib -lpubsub
endif endif
tmcd: tmcd.c ${TMCDLIBS} tmcd.h version.o $(BOOTINFO) $(NOTPMLIB) tmcd: tmcd.c ${TMCDLIBS} tmcd.h version.o $(BOOTINFO) $(NOTPMLIB)
$(CC) $(CFLAGS) $(SSLFLAGS) $(TMCDCFLAGS) -o tmcd $< \ $(CC) $(TMCDCFLAGS) $(CFLAGS) $(SSLFLAGS) -o tmcd $< \
version.o $(NOTPMLIB) $(BOOTINFO) \ version.o $(NOTPMLIB) $(BOOTINFO) \
$(LFLAGS) -L/usr/local/lib/mysql -lmysqlclient \ $(LFLAGS) -L/usr/local/lib/mysql -lmysqlclient \
$(ELVINFLAGS) $(TMCDLDFLAGS) $(TMCDLIBS) $(TMLIBS) $(ELVINFLAGS) $(TMCDLDFLAGS) $(TMCDLIBS) $(TMLIBS)
...@@ -90,14 +90,14 @@ mod_tmcd.so: libtmcd.o ...@@ -90,14 +90,14 @@ mod_tmcd.so: libtmcd.o
newtmcd: newtmcd.c libtmcd.o ${TMCDLIBS} tmcd.h version.o \ newtmcd: newtmcd.c libtmcd.o ${TMCDLIBS} tmcd.h version.o \
$(NOTPMLIB) $(BOOTINFO) $(NOTPMLIB) $(BOOTINFO)
$(CC) $(CFLAGS) $(SSLFLAGS) $(TMCDCFLAGS) -o tmcd $< \ $(CC) $(TMCDCFLAGS) $(CFLAGS) $(SSLFLAGS) -o tmcd $< \
libtmcd.o version.o $(NOTPMLIB) $(BOOTINFO) \ libtmcd.o version.o $(NOTPMLIB) $(BOOTINFO) \
$(LFLAGS) -L/usr/local/lib/mysql -lmysqlclient -lxml2 \ $(LFLAGS) -L/usr/local/lib/mysql -lmysqlclient -lxml2 \
$(ELVINFLAGS) $(TMCDLDFLAGS) $(TMCDLIBS) $(TMLIBS) $(ELVINFLAGS) $(TMCDLDFLAGS) $(TMCDLIBS) $(TMLIBS)
libtmcd.o: libtmcd.c ${TMCDLIBS} tmcd.h version.o $(BOOTINFO) libtmcd.o: libtmcd.c ${TMCDLIBS} tmcd.h version.o $(BOOTINFO)
$(CC) $(CFLAGS) -I/usr/local/include/libxml2 $(SSLFLAGS) \ $(CC) $(TMCDCFLAGS) $(CFLAGS) $(SSLFLAGS) \
$(TMCDCFLAGS) -c -o libtmcd.o $< -I/usr/local/include/libxml2 -c -o libtmcd.o $<
libtmcd.so: libtmcd.o ${TMCDLIBS} tmcd.h $(BOOTINFO) libtmcd.so: libtmcd.o ${TMCDLIBS} tmcd.h $(BOOTINFO)
$(LD) -shared $^ -L/usr/local/lib/mysql -lxml2 -lmysqlclient \ $(LD) -shared $^ -L/usr/local/lib/mysql -lxml2 -lmysqlclient \
......
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