Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emulab
emulab-devel
Commits
3df943c3
Commit
3df943c3
authored
Mar 27, 2010
by
David Johnson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix hardcoded perl dir in swig stuff in rmanage
parent
4b65a7f9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
23 additions
and
4 deletions
+23
-4
tools/rmanage/GNUmakefile.in
tools/rmanage/GNUmakefile.in
+23
-4
No files found.
tools/rmanage/GNUmakefile.in
View file @
3df943c3
...
...
@@ -15,7 +15,6 @@ SYSTEM := $(shell $(TESTBED_SRCDIR)/utils/osstuff.sh -t)
CFLAGS = -Wall
LDFLAGS = -lssl
SWIG_INCS = -I/usr/local/lib/perl5/5.8.8/mach/CORE -I$(SRCDIR)
# XXX lame, doesn't compile on freebsd4
ifneq ($(SYSTEM),freebsd4)
...
...
@@ -23,6 +22,26 @@ LIB_STUFF = rmcp.so rmcp.pm
SBIN_STUFF = rmanage
endif
SYSTEM = $(shell uname -s)
SEDEXTARG = -E
ifeq ($(SYSTEM),Linux)
SEDEXTARG = -r
endif
PCOREDIR = `perl -V | sed -n $(SEDEXTARG) -e 's/^[ \t]+(\/usr(\/local)?\/lib\/perl5\/5.+\/.+)$$/\1/p' | grep -v BSDPAN\$$`
PCORE = $(PCOREDIR)/CORE
PCFLAGS = `perl -e 'use Config; print $$Config{ccflags} . " " . $$Config{ccdlflags};'`
# remove PCFLAGS since newer swigs can't seem to handle the gcc options (or
# maybe earlier perls didn't include them...)
SWIG_INCS = -I$(PCORE) -I$(SRCDIR) #$(PCFLAGS)
SWIG_GCC_INCS = -I$(PCORE) -I$(SRCDIR) $(PCFLAGS)
MYSQL_LIBS = -L/usr/local/lib/mysql -lmysqlclient
ifeq ($(SYSTEM),Linux)
MYSQL_LIBS = `mysql_config --libs`
endif
all: $(SBIN_STUFF) $(LIB_STUFF)
include $(TESTBED_SRCDIR)/GNUmakerules
...
...
@@ -32,14 +51,14 @@ rmcp.so: rmcp.o rmcp_wrap.o
ld -shared $^ -lssl -o rmcp.so
swig-wrappers: rmcp.h rmcp.i
swig -perl5 -module rmcp -o rmcp_wrap.c $(SWIG_INCS) $(SRCDIR)/rmcp.i
swig -perl5 -module rmcp -o
$(SRCDIR)/
rmcp_wrap.c $(SWIG_INCS) $(SRCDIR)/rmcp.i
rmcp_wrap.o: $(SRCDIR)/rmcp_wrap.c
$(CC) -fpic -c $(CFLAGS) $(SWIG_INCS) $(LDFLAGS) $(SRCDIR)/rmcp_wrap.c
$(CC) -fpic -c $(CFLAGS) $(SWIG_
GCC_
INCS) $(LDFLAGS) $(SRCDIR)/rmcp_wrap.c
rmanage: GNUmakefile rmanage.o rmcp.o \
${OBJDIR}/lib/libtb/tbdb.o ${OBJDIR}/lib/libtb/log.o
$(CC) $(CFLAGS) $(LDFLAGS)
-L/usr/local/lib/mysql -lmysqlclient
\
$(CC) $(CFLAGS) $(LDFLAGS)
$(MYSQL_LIBS)
\
rmanage.o rmcp.o ${OBJDIR}/lib/libtb/tbdb.o \
${OBJDIR}/lib/libtb/log.o -o rmanage
cp rmanage rmanage.debug
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment