From d13be06aaa918f7098570f7f0f7a2a600a48d9a0 Mon Sep 17 00:00:00 2001
From: Michal Marek <mmarek@suse.cz>
Date: Mon, 31 Mar 2008 12:09:43 +0000
Subject: Removed the generated ca-bundle.h file. The verbatim value of $ca and
 $capath is known to configure, so it can be defined in config.h instead.

---
 lib/Makefile.netware | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

(limited to 'lib/Makefile.netware')

diff --git a/lib/Makefile.netware b/lib/Makefile.netware
index 1a4610d85..ae0cc7392 100644
--- a/lib/Makefile.netware
+++ b/lib/Makefile.netware
@@ -230,7 +230,7 @@ nlm: prebuild $(TARGET).nlm
 
 lib: prebuild $(TARGET).$(LIBEXT)
 
-prebuild: $(OBJDIR) $(OBJDIR)/version.inc config.h ca-bundle.h
+prebuild: $(OBJDIR) $(OBJDIR)/version.inc config.h
 
 $(OBJDIR)/%.o: %.c
 #	@echo Compiling $<
@@ -252,7 +252,7 @@ ifdef WITH_SSL
 endif
 
 clean:
-	-$(RM) config.h ca-bundle.h
+	-$(RM) config.h
 	-$(RM) -r $(OBJDIR)
 
 distclean: clean
@@ -523,25 +523,11 @@ endif
 
 FORCE: ;
 
-ca-bundle.h: FORCE Makefile.netware
-	@echo Creating $@
-	@echo $(DL)/* Do not edit this file - it is created by make!$(DL) > $@
-	@echo $(DL)** All your changes will be lost!!$(DL) >> $@
-	@echo $(DL)*/$(DL) >> $@
-ifdef CABUNDLE
-	@echo $(DL)#define CURL_CA_BUNDLE "$(CABUNDLE)"$(DL) >> $@
-else
-	@echo $(DL)#define CURL_CA_BUNDLE getenv("CURL_CA_BUNDLE")$(DL) >> $@
-endif
-
 info: $(OBJDIR)/version.inc
 	@echo Configured to build $(TARGET) with these options:
 	@echo libarchitecture: $(LIBARCH)
 	@echo curl version:    $(LIBCURL_VERSION_STR)
 	@echo compiler/linker: $(CC) / $(LD)
-ifdef CABUNDLE
-	@echo ca-bundle path:  $(CABUNDLE)
-endif
 ifdef WITH_SSL
 	@echo SSL support:     enabled (OpenSSL)
 else
-- 
cgit v1.2.1