From d3238ebee7f8f4da2de15c915fe2e62bf0f216f9 Mon Sep 17 00:00:00 2001
From: Stuart Hodgson <stuart.hodgson@potentialventures.com>
Date: Thu, 18 Jul 2013 18:14:21 +0100
Subject: [PATCH] Issue #50: Some cleanups and path fixes for installation

---
 Makefile                          | 3 ++-
 bin/create_files.py               | 3 +--
 lib/Makefile                      | 6 +++---
 makefiles/Makefile.inc            | 6 +++---
 makefiles/simulators/Makefile.vcs | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index c272ab865f..a114e44d76 100644
--- a/Makefile
+++ b/Makefile
@@ -48,13 +48,14 @@ pycode:
 src_install:
 	@mkdir -p $(FULL_INSTALL_DIR)/lib
 	@mkdir -p $(FULL_INSTALL_DIR)/bin
+	@mkdir -p $(FULL_INSTALL_DIR)/include
 	@cp -R lib/* $(FULL_INSTALL_DIR)/lib/
+	@cp -R include/* $(FULL_INSTALL_DIR)/include/
 
 common_install:
 	@cp -R bin/cocotbenv.py $(FULL_INSTALL_DIR)/bin/
 	@cp -R bin/create_project.py $(FULL_INSTALL_DIR)/bin/
 	@cp -R makefiles $(FULL_INSTALL_DIR)/
-	@rm -rf $(FULL_INSTALL_DIR)/makefiles/Makefile.inc
 
 create_files:
 	bin/create_files.py $(FULL_INSTALL_DIR)
diff --git a/bin/create_files.py b/bin/create_files.py
index 58518f42bd..0544422e2a 100755
--- a/bin/create_files.py
+++ b/bin/create_files.py
@@ -54,11 +54,10 @@ def print_uninstall(path):
     uninstall.write(file_contents)
 
 def print_files(path):
-    print_make_inc(path)
     print_uninstall(path)
 
     call("install -m 544 /tmp/cocotb_uninstall " + path + "/bin/cocotb_uninstall", shell=True)
-    call("install -m 666 /tmp/Makefile.inc " + path + "/makefiles/Makefile.inc", shell=True)
+    call("rm -rf /tmp/cocotb_uninstall", shell=True)
 
 def check_args(args):
     if len(args) is not 1:
diff --git a/lib/Makefile b/lib/Makefile
index eca3b6d739..a80f86e679 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -27,17 +27,17 @@
 
 include $(SIM_ROOT)/makefiles/Makefile.inc
 
-CLIBS:= $(SIM_ROOT)/lib/simulator \
+CLIBS:= $(SIM_ROOT)/lib/gpi \
 		$(SIM_ROOT)/lib/embed \
 		$(SIM_ROOT)/lib/vpi_shim \
-		$(SIM_ROOT)/lib/gpi
+		$(SIM_ROOT)/lib/simulator
 
 libs_native: $(CLIBS)
 
 force_32:
 	ARCH=i686 make
 
-$(SIM_ROOT)/lib/vpi_shim: $(SIM_ROOT)/lib/embed $(SIM_ROOT)/lib/gpi
+$(SIM_ROOT)/lib/vpi_shim: $(SIM_ROOT)/lib/gpi $(SIM_ROOT)/lib/embed
 $(SIM_ROOT)/lib/simulator: $(SIM_ROOT)/lib/vpi_shim
 
 $(LIB_OBJ_DIR):
diff --git a/makefiles/Makefile.inc b/makefiles/Makefile.inc
index 410b3fb4f5..321a595b8a 100644
--- a/makefiles/Makefile.inc
+++ b/makefiles/Makefile.inc
@@ -32,7 +32,7 @@ export SIM_ROOT:=$(abspath $(dir $(lastword $(MAKEFILE_LIST)))/..)
 endif
 
 ifeq ($(USER_DIR),)
-export USER_DIR:=/tmp/cocotb
+export USER_DIR:=$(SIM_ROOT)
 endif
 
 BUILD_DIR=$(USER_DIR)/build
@@ -48,9 +48,11 @@ include $(SIM_ROOT)/makefiles/Makefile.paths
 include $(SIM_ROOT)/makefiles/Makefile.pylib
 
 export LIB_DIR=$(BUILD_DIR)/libs/$(ARCH)
+export LIB_OBJ_DIR:= $(BUILD_DIR)/obj/$(ARCH)
 export INCLUDES := -I$(SIM_ROOT)/include $(PYTHON_INCLUDEDIR)
 
 
+
 # Base GCC flags
 ifeq ($(OS),Darwin)
 GCC_ARGS    :=  -g -DDEBUG -fpic
@@ -69,5 +71,3 @@ LINKER_ARGS := -shared -undefined suppress -flat_namespace -L$(PYTHON_LIBDIR)
 else
 LINKER_ARGS := -shared -Xlinker -export-dynamic
 endif
-
-LIB_OBJ_DIR:= $(BUILD_DIR)/obj/$(ARCH)
diff --git a/makefiles/simulators/Makefile.vcs b/makefiles/simulators/Makefile.vcs
index b073c5eb4d..396df7199a 100644
--- a/makefiles/simulators/Makefile.vcs
+++ b/makefiles/simulators/Makefile.vcs
@@ -34,7 +34,7 @@ endif
 
 all: $(SIM_OBJ_DIR) sim
 
-$(SIM_OBJ_DIR):
+$(OBJ_DIR):
 	mkdir -p $(OBJ_DIR)