From 43d9a7de9b83f437d55c2cbc6e9625e3fafa5102 Mon Sep 17 00:00:00 2001
From: grischka <grischka>
Date: Mon, 13 Feb 2017 19:03:29 +0100
Subject: updates & cleanups (tcc-doc/Changelog/TODO ...)

- tcc-doc.texi: commandline option info update
- Changelog/TODO: update
- tests/tcctest.py: removed
- tests/Makefile: weaktest fixed
- tests/tests2: some files renamed and/or converted to unix LF
- configure/Makefile: --enable-static option (no dll on win32)
- win32/build-tcc.bat: msvc support
- win32/tcc-win32.txt: build info update
- win32/vs2015/: VS solution removed
- win32/include/tcc/tcc_libm.h: #include statement fixed
- tcc.c: -include <file> option help info
- .gitignore: cleanup
---
 Makefile | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 9527d12..c13ce37 100644
--- a/Makefile
+++ b/Makefile
@@ -26,14 +26,16 @@ LINK_LIBTCC =
 LIBS =
 
 ifdef CONFIG_WIN32
- LIBTCC = libtcc.dll
+ ifneq ($(DISABLE_STATIC),no)
+  LIBTCC = libtcc.dll
+ endif
 else
  LIBS=-lm
  ifndef CONFIG_NOLDL
   LIBS+=-ldl
  endif
  # make libtcc as static or dynamic library?
- ifdef DISABLE_STATIC
+ ifeq ($(DISABLE_STATIC),yes)
   LIBTCC=libtcc.so
   ifndef DISABLE_RPATH
    LINK_LIBTCC += -Wl,-rpath,"$(libdir)"
@@ -92,7 +94,7 @@ ARM64_FILES = $(CORE_FILES) arm64-gen.c arm64-link.c
 C67_FILES = $(CORE_FILES) c67-gen.c c67-link.c tcccoff.c
 
 ifdef CONFIG_WIN32
- PROGS+=tiny_impdef$(EXESUF) tiny_libmaker$(EXESUF) $(LIBTCC)
+ PROGS+=tiny_impdef$(EXESUF) tiny_libmaker$(EXESUF)
  ifeq ($(ARCH),x86-64)
   NATIVE_FILES=$(WIN64_FILES)
   PROGS_CROSS=$(WIN32_CROSS) $(X64_CROSS) $(ARM_CROSS) $(ARM64_CROSS) $(C67_CROSS) $(WINCE_CROSS)
@@ -272,14 +274,14 @@ install:
 	mkdir -p "$(tccdir)/examples"
 	mkdir -p "$(tccdir)/doc"
 	mkdir -p "$(tccdir)/libtcc"
-	$(INSTALLBIN) -m755 $(PROGS) "$(tccdir)"
+	$(INSTALLBIN) -m755 $(PROGS) $(subst libtcc.a,,$(LIBTCC)) "$(tccdir)"
 	$(INSTALL) -m644 libtcc1.a $(TOPSRC)/win32/lib/*.def "$(tccdir)/lib"
 	cp -r $(TOPSRC)/win32/include/. "$(tccdir)/include"
 	cp -r $(TOPSRC)/win32/examples/. "$(tccdir)/examples"
 	cp $(TOPSRC)/tests/libtcc_test.c "$(tccdir)/examples"
 	$(INSTALL) -m644 $(TOPSRC)/include/*.h $(TOPSRC)/tcclib.h "$(tccdir)/include"
-	$(INSTALL) -m644 tcc-doc.html $(TOPSRC)/win32/tcc-win32.txt "$(tccdir)/doc"
-	$(INSTALL) -m644 $(TOPSRC)/libtcc.h libtcc.def "$(tccdir)/libtcc"
+	$(INSTALL) -m644 $(TOPSRC)/libtcc.h $(subst .dll,.def,$(LIBTCC)) "$(tccdir)/libtcc"
+	-$(INSTALL) -m644 $(TOPSRC)/win32/tcc-win32.txt tcc-doc.html "$(tccdir)/doc"
 ifdef CONFIG_CROSS
 	mkdir -p "$(tccdir)/lib/32"
 	mkdir -p "$(tccdir)/lib/64"
-- 
cgit v1.3.1