citrun

commit 2780f0ca51134c99d4366dc794a8633d0e57f9e0
parent 2f26094ae59264d73ec5f32ffb31a2a8dd7ab5fc
Author: Kyle Milz <kyle@getaddrinfo.net>
Date:   Sat, 12 Mar 2016 16:48:02 -0700

move scv_wrap and scv_global.h to root directory

Diffstat:
M
Makefile
 | 
2
+-
M
SCV/Project.pm
 | 
2
+-
D
bin/Makefile
 | 
1
-
D
bin/scv_wrap
 | 
16
----------------
D
include/Makefile
 | 
4
----
M
lib/Makefile
 | 
2
+-
R
include/scv_global.h -> scv_global.h
 | 
0

A
scv_wrap
 | 
16
++++++++++++++++

8 files changed, 19 insertions(+), 24 deletions(-)
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-SUBDIR= bin instrument include lib viewer
+SUBDIR= instrument lib viewer
 
 test:
 	prove
diff --git a/SCV/Project.pm b/SCV/Project.pm
@@ -54,7 +54,7 @@ EOF
 	$ENV{PATH} = "$ENV{SCV_PATH}:$ENV{PATH}";
 
 	# Link in the runtime
-	$ENV{CFLAGS} = "-pthread -I/home/kyle/src/scv/include";
+	$ENV{CFLAGS} = "-pthread -I/home/kyle/src/scv";
 	$ENV{LDLIBS} = "-L/home/kyle/src/scv/lib -lscv -pthread";
 	$ENV{LD_LIBRARY_PATH} = "lib";
 
diff --git a/bin/Makefile b/bin/Makefile
@@ -1 +0,0 @@
-.include <bsd.prog.mk>
diff --git a/bin/scv_wrap b/bin/scv_wrap
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-scv_root=/home/kyle/src/scv
-
-if ! test -d $scv_root/compilers; then
-	echo error: compilers/ directory does not exist
-	exit 1
-fi
-
-export SCV_PATH="$scv_root/compilers"
-export PATH="$SCV_PATH:$PATH"
-
-export CFLAGS="-pthread -I$scv_root/include"
-export LDLIBS="-L$scv_root/lib -lruntime -pthread"
-
-exec $@
diff --git a/include/Makefile b/include/Makefile
@@ -1,4 +0,0 @@
-all:
-clean:
-
-.include <bsd.own.mk>
diff --git a/lib/Makefile b/lib/Makefile
@@ -1,7 +1,7 @@
 LIB = scv
 SRCS = runtime.c
 
-CFLAGS += -pthread -I../include
+CFLAGS += -pthread -I../
 
 NOPROFILE = 1
 .include <bsd.lib.mk>
diff --git a/include/scv_global.h b/scv_global.h
diff --git a/scv_wrap b/scv_wrap
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+scv_root=/home/kyle/src/scv
+
+if ! test -d $scv_root/instrumnet/compilers; then
+	echo error: compilers/ directory does not exist
+	exit 1
+fi
+
+export SCV_PATH="$scv_root/instrument/compilers"
+export PATH="$SCV_PATH:$PATH"
+
+export CFLAGS="-pthread -I$scv_root"
+export LDLIBS="-L$scv_root/lib -lruntime -pthread"
+
+exec $@