aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAkim Demaille <akim@lrde.epita.fr>2012-12-14 17:18:03 +0100
committerAkim Demaille <akim@lrde.epita.fr>2012-12-18 10:06:20 +0100
commit3f09b90d211a86c1d002a786a5ffc34b72fba780 (patch)
tree83cf6a8b7031af509712a70ff92f69a4366e0861 /lib
parentd815896d4c07acbf12ca4b57b2ad530d85147de4 (diff)
downloadtinycc-3f09b90d211a86c1d002a786a5ffc34b72fba780.tar.gz
tinycc-3f09b90d211a86c1d002a786a5ffc34b72fba780.tar.bz2
build: fix VPATH builds
* configure (fn_dirname): New. Use it to ensure the creation of proper symlinks to Makefiles. (config.mak): Define top_builddir and top_srcdir. (CPPFLAGS): Be sure to find the headers. * Makefile, lib/Makefile, tests/Makefile, tests2/Makefile: Adjust to set VPATH properly. Fix confusion between top_builddir and top_srcdir.
Diffstat (limited to 'lib')
-rw-r--r--lib/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/Makefile b/lib/Makefile
index 6813052..a3e2cd1 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -4,6 +4,7 @@
TOP = ..
include $(TOP)/config.mak
+VPATH = $(top_srcdir)/lib $(top_srcdir)/win32/lib
ifndef TARGET
ifdef CONFIG_WIN64
@@ -42,8 +43,6 @@ X86_64_O = libtcc1.o alloca86_64.o
WIN32_O = $(I386_O) crt1.o wincrt1.o dllcrt1.o dllmain.o chkstk.o bcheck.o
WIN64_O = $(X86_64_O) crt1.o wincrt1.o dllcrt1.o dllmain.o chkstk.o
-VPATH = $(TOP)/lib $(TOP)/win32/lib
-
ifeq "$(TARGET)" "i386-win32"
OBJ = $(addprefix $(DIR)/,$(WIN32_O))
TGT = -DTCC_TARGET_I386 -DTCC_TARGET_PE