From 68cfe929c4124fbf231aea04b17d81febd388ec6 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Sun, 10 Aug 2008 18:33:41 +0000 Subject: Fix NetWare curlbuild.h NetWare curlbuild.h settings depend on whether LIBC or CLIB is used. The NetWare specific Makefile is capable of knowing which target is being built. So, finally, the NetWare Makefile will take care of generating curlbuild.h --- lib/Makefile.netware | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/Makefile.netware b/lib/Makefile.netware index 3721d7ccf..bab5d79ee 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 +prebuild: $(OBJDIR) $(CURL_INC)/curl/curlbuild.h $(OBJDIR)/version.inc config.h $(OBJDIR)/%.o: %.c # @echo Compiling $< @@ -584,4 +584,28 @@ ca-bundle.crt: mk-ca-bundle.pl @echo Creating $@ @-$(PERL) $< -b -n $@ - +$(CURL_INC)/curl/curlbuild.h: Makefile.netware + @echo Creating $@ + @echo $(DL)#ifndef __CURL_CURLBUILD_H$(DL) > $@ + @echo $(DL)#define __CURL_CURLBUILD_H$(DL) >> $@ + @echo $(DL)/* $@ intended for NetWare target.$(DL) >> $@ + @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) >> $@ +ifeq ($(LIBARCH),LIBC) + # NetWare - LIBC curlbuild.h settings. + @echo $(DL)#define CURL_OFF_T long long$(DL) >> $@ + @echo $(DL)#define CURL_FMT_OFF_T "lld"$(DL) >> $@ + @echo $(DL)#define CURL_FMT_OFF_TU "llu"$(DL) >> $@ + @echo $(DL)#define CURL_FORMAT_OFF_T "%lld"$(DL) >> $@ + @echo $(DL)#define CURL_SIZEOF_CURL_OFF_T 8$(DL) >> $@ +else + # NetWare - CLIB curlbuild.h settings. + @echo $(DL)#define CURL_OFF_T long$(DL) >> $@ + @echo $(DL)#define CURL_FMT_OFF_T "ld"$(DL) >> $@ + @echo $(DL)#define CURL_FMT_OFF_TU "lu"$(DL) >> $@ + @echo $(DL)#define CURL_FORMAT_OFF_T "%ld"$(DL) >> $@ + @echo $(DL)#define CURL_SIZEOF_CURL_OFF_T 4$(DL) >> $@ +endif + @echo $(DL)#endif /* __CURL_CURLBUILD_H */$(DL) >> $@ + -- cgit v1.2.3