From 47e06c6d4e542e47fcbad69a78c2436a854a0779 Mon Sep 17 00:00:00 2001
From: gus knight <waddlesplash@gmail.com>
Date: Mon, 27 Jul 2015 16:03:25 -0400
Subject: Reorganize the source tree.

 * Documentation is now in "docs".
 * Source code is now in "src".
 * Misc. fixes here and there so that everything still works.

I think I got everything in this commit, but I only tested this
on Linux (Make) and Windows (CMake), so I might've messed
something up on other platforms...
---
 tests/Makefile        | 10 +++++-----
 tests/pp/Makefile     |  2 +-
 tests/tests2/Makefile |  6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'tests')

diff --git a/tests/Makefile b/tests/Makefile
index 270eaa7..f83027f 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -2,7 +2,7 @@
 # Tiny C Compiler Makefile - tests
 #
 
-TOP = ..
+TOP = ../src
 include $(TOP)/Makefile
 SRCDIR = $(top_srcdir)/tests
 VPATH = $(SRCDIR) $(top_srcdir)
@@ -60,11 +60,11 @@ ifeq ($(TARGETOS),Darwin)
 endif
 
 # run local version of tcc with local libraries and includes
-TCCFLAGS = -B$(TOP) -I$(TOP) -I$(top_srcdir) -I$(top_srcdir)/include -L$(TOP)
+TCCFLAGS = -B$(TOP)/../lib -I$(TOP) -I$(top_srcdir) -I$(top_srcdir)/../include -L$(TOP)
 ifdef CONFIG_WIN32
- TCCFLAGS = -B$(top_srcdir)/win32 -I$(top_srcdir) -I$(top_srcdir)/include -L$(TOP)
+ TCCFLAGS = -B$(top_srcdir)/win32 -I$(top_srcdir) -I$(top_srcdir)/../include -L$(TOP)
 endif
-XTCCFLAGS = -B$(TOP) -B$(top_srcdir)/win32 -I$(TOP) -I$(top_srcdir) -I$(top_srcdir)/include
+XTCCFLAGS = -B$(TOP)/../lib -B$(top_srcdir)/win32 -I$(TOP) -I$(top_srcdir) -I$(top_srcdir)/../include
 
 TCC = $(TOP)/tcc $(TCCFLAGS)
 RUN_TCC = $(NATIVE_DEFINES) -DONE_SOURCE -run $(top_srcdir)/tcc.c $(TCCFLAGS)
@@ -73,7 +73,7 @@ DISAS = objdump -d
 
 # libtcc test
 ifdef LIBTCC1
- LIBTCC1:=$(TOP)/$(LIBTCC1)
+ LIBTCC1:=$(TOP)/lib/$(LIBTCC1)
 endif
 
 all test : $(TESTS)
diff --git a/tests/pp/Makefile b/tests/pp/Makefile
index c656f9a..8bbf1a7 100644
--- a/tests/pp/Makefile
+++ b/tests/pp/Makefile
@@ -2,7 +2,7 @@
 # credits: 01..13.c from the pcc cpp-tests suite
 #
 
-TCC = ../../tcc
+TCC = ../../src/tcc
 TESTS = $(patsubst %.c,%.test,$(wildcard *.c))
 
 all test : $(TESTS)
diff --git a/tests/tests2/Makefile b/tests/tests2/Makefile
index 254fa5c..980934b 100644
--- a/tests/tests2/Makefile
+++ b/tests/tests2/Makefile
@@ -1,4 +1,4 @@
-TOP = ../..
+TOP = ../../src
 include $(TOP)/Makefile
 
 # clear CFLAGS and LDFLAGS
@@ -6,9 +6,9 @@ CFLAGS :=
 LDFLAGS :=
 
 ifdef CONFIG_WIN32
- TCCFLAGS = -B$(top_srcdir)/win32 -I$(top_srcdir)/include -L$(TOP)
+ TCCFLAGS = -B$(top_srcdir)/win32 -I$(top_srcdir)/../include -L$(TOP)
 else
- TCCFLAGS = -B$(TOP) -I$(top_srcdir)/include -lm
+ TCCFLAGS = -B$(TOP)/../lib -I$(top_srcdir)/../include -lm
 endif
 
 ifeq ($(TARGETOS),Darwin)
-- 
cgit v1.3.1