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.
This commit is contained in:
Michal Marek
2008-03-31 12:09:43 +00:00
parent f1c69192da
commit d13be06aaa
13 changed files with 14 additions and 80 deletions

View File

@@ -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