citrun

commit 8b8d868f9ac70bd3cf0559cded1c3bc742517ba4
parent 186e4e2f84f87770a94057fbf2a7fc25b2e78937
Author: Kyle Milz <kyle@0x30.net>
Date:   Tue,  9 Aug 2016 17:22:10 -0600

lib: move to src

Diffstat:
M
Jamfile
 | 
1
-
M
Jamrules
 | 
4
++--
D
lib/Jamfile
 | 
6
------
M
src/Jamfile
 | 
9
++++++++-
M
src/inst_main.cc
 | 
2
+-
R
lib/runtime.c -> src/runtime.c
 | 
0

R
lib/runtime.h -> src/runtime.h
 | 
0

M
src/runtime_proc.cc
 | 
2
+-

8 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/Jamfile b/Jamfile
@@ -1,5 +1,4 @@
 SubDir TOP ;
 
-SubInclude TOP lib ;
 SubInclude TOP man ;
 SubInclude TOP src ;
diff --git a/Jamrules b/Jamrules
@@ -6,14 +6,14 @@ if $(PREFIX) {
 else {
 	# No PREFIX means an in tree build. Use absolute paths to local copies.
 	ROOT = "`readlink -f $(TOP)`" ;
-	CITRUN_LIB =  $(ROOT)/lib/libcitrun.a ;
+	CITRUN_LIB =  $(ROOT)/src/libcitrun.a ;
 	CITRUN_PATH = $(ROOT)/src ;
 }
 
 # Try and respect this, {pkg,llvm}-config gives -O? too unfortunately
 OPTIM = $(CFLAGS) ;
 
-C++FLAGS += -std=c++11 -I$(TOP) ;
+C++FLAGS += -std=c++11 ;
 
 _CLANG_LIBS =
 	-lclangAST
diff --git a/lib/Jamfile b/lib/Jamfile
@@ -1,6 +0,0 @@
-SubDir TOP lib ;
-
-SubDirCcFlags -fPIC -pthread -ansi ;
-
-Library libcitrun : runtime.c ;
-InstallLib $(PREFIX)/lib : libcitrun.a ;
diff --git a/src/Jamfile b/src/Jamfile
@@ -1,6 +1,13 @@
 SubDir TOP src ;
 
 #
+# libcitrun.a
+#
+ObjectCcFlags runtime.c : -fPIC -pthread -ansi ;
+Library libcitrun : runtime.c ;
+InstallLib $(PREFIX)/lib : libcitrun.a ;
+
+#
 # citrun-wrap, citrun-check
 #
 MkWrap citrun-wrap : wrap.in ;
@@ -57,7 +64,7 @@ INST_SRCS =
 	inst_action.cc
 	inst_visitor.cc ;
 
-Stringize runtime_h.h : $(TOP)/lib/runtime.h ;
+Stringize runtime_h.h : runtime.h ;
 
 ObjectC++Flags $(INST_SRCS) : `llvm-config --cxxflags` ;
 ObjectC++Flags $(INST_SRCS) : -DCITRUN_LIB=$(CITRUN_LIB)
diff --git a/src/inst_main.cc b/src/inst_main.cc
@@ -31,7 +31,7 @@
 #include <sstream>		// stringstream
 #include <unistd.h>		// execvp, fork, getpid, unlink
 
-#include "lib/runtime.h"	// citrun_major, citrun_minor
+#include "runtime.h"		// citrun_major, citrun_minor
 #include "inst_main.h"
 
 #define STR_EXPAND(tok) #tok
diff --git a/lib/runtime.c b/src/runtime.c
diff --git a/lib/runtime.h b/src/runtime.h
diff --git a/src/runtime_proc.cc b/src/runtime_proc.cc
@@ -17,7 +17,7 @@
 #include <err.h>
 #include <fstream>
 
-#include "lib/runtime.h"	// citrun_major
+#include "runtime.h"		// citrun_major
 #include "runtime_proc.h"
 
 RuntimeProcess::RuntimeProcess(af_unix &sock) :