config.mk is legacy

git-svn-id: file:///raid/svn-main/nishi-libw3/trunk@186 d27a3e52-49c5-7645-884c-6793ebffc270

diff --git a/Makefile b/Makefile
index c6c43c3c0e86dd06818bee9f1d9480b7cbabe8e8..a6117ba8fa2f15efb91e7ca5120a620e64367fd3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,19 @@
 # $Id$
-include config.mk
+PKGCONF := pkg-config
 
 PREFIX := /usr/local
-PKGCONF := pkg-config
+SSL := YES
+TCL := NO
+TCL_PKGCONF := YES
+DEBUG := NO
 
 ifeq ("$(wildcard cache.mk)","")
 $(info Creating cache.mk)
 IGNORE := $(shell echo "PREFIX=$(PREFIX)" > cache.mk)
 IGNORE := $(shell echo "TCL_PKGCONF=$(TCL_PKGCONF)" >> cache.mk)
+IGNORE := $(shell echo "TCL=$(TCL)" >> cache.mk)
+IGNORE := $(shell echo "SSL=$(SSL)" >> cache.mk)
+IGNORE := $(shell echo "DEBUG=$(DEBUG)" >> cache.mk)
 include cache.mk
 else
 include cache.mk

diff --git a/config.mk b/config.mk
deleted file mode 100644 (file)
index 4452ff4..0000000
--- a/config.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-SSL=YES
-DEBUG=YES