diff options
| author | Bryan Ischo <bryan@ischo.com> | 2008-08-14 12:14:46 +0000 |
|---|---|---|
| committer | Bryan Ischo <bryan@ischo.com> | 2008-08-14 12:14:46 +0000 |
| commit | 4e841bcc1010f8dd36031c57460908c368c5cb9f (patch) | |
| tree | 3189d40ff2ad5e871df575a2d4d80dbb1e4d0e4d /GNUmakefile.mingw | |
| parent | 7fd73adff17c0511cf2c09da16d46d1a8e608866 (diff) | |
| download | ceph-libs3-4e841bcc1010f8dd36031c57460908c368c5cb9f.tar.gz | |
* Support GNUTLS on Windows. But - it doesn't work. Maybe my GNUTLS
library is too old? Since openssl does work, I expect that I will
branch this and revert.
Diffstat (limited to 'GNUmakefile.mingw')
| -rw-r--r-- | GNUmakefile.mingw | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/GNUmakefile.mingw b/GNUmakefile.mingw index 4fc922e..ffe2d16 100644 --- a/GNUmakefile.mingw +++ b/GNUmakefile.mingw @@ -76,12 +76,16 @@ ifndef LIBXML2_CFLAGS LIBXML2_CFLAGS := -Ic:\libs3-libs\include endif -ifndef OPENSSL_LIBS - OPENSSL_LIBS := -Lc:\openssl -lssl32 -leay32 +ifndef GCRYPT_CFLAGS + GCRYPT_CFLAGS := -Ic:\libs3-libs\include endif -ifndef OPENSSL_CFLAGS - OPENSSL_CFLAGS := -Ic:\openssl\include +ifndef GCRYPT_LIBS + GCRYPT_LIBS := -Lc:\libs3-libs\bin -lgcrypt-11 +endif + +ifndef GNUTLS_LIBS + GNUTLS_LIBS := -Lc:\libs3-libs\bin -lgnutls-26 endif @@ -95,12 +99,12 @@ ifndef CFLAGS endif CFLAGS += -Wall -Werror -std=c99 -Iinc $(CURL_CFLAGS) $(LIBXML2_CFLAGS) \ - $(OPENSSL_CFLAGS) \ -DLIBS3_VER_MAJOR=\"$(LIBS3_VER_MAJOR)\" \ -DLIBS3_VER_MINOR=\"$(LIBS3_VER_MINOR)\" \ -Dsleep=Sleep -DFOPEN_EXTRA_FLAGS=\"b\" \ -Iinc/mingw -include windows.h +LDFLAGS = $(CURL_LIBS) $(LIBXML2_LIBS) $(GCRYPT_LIBS) $(GNUTLS_LIBS) # -------------------------------------------------------------------------- # Default targets are everything @@ -144,7 +148,7 @@ $(BUILD)/obj/%.o: src/%.c # -------------------------------------------------------------------------- # libs3 library targets -LIBS3_SHARED = $(BUILD)/lib/libs3.dll +LIBS3_SHARED = $(BUILD)/bin/libs3.dll .PHONY: libs3 libs3: $(LIBS3_SHARED) $(BUILD)/lib/libs3.a @@ -156,7 +160,7 @@ LIBS3_SOURCES := src/acl.c src/bucket.c src/error_parser.c src/general.c \ $(LIBS3_SHARED): $(LIBS3_SOURCES:src/%.c=$(BUILD)/obj/%.o) -@mkdir $(subst /,\,$(dir $@)) - gcc -shared -o $@ $^ $(CURL_LIBS) $(LIBXML2_LIBS) $(OPENSSL_LIBS) -lws2_32 + gcc -shared -o $@ $^ $(LDFLAGS) -lws2_32 $(BUILD)/lib/libs3.a: $(LIBS3_SHARED) -@mkdir $(subst /,\,$(dir $@)) @@ -173,7 +177,7 @@ s3: $(BUILD)/bin/s3.exe $(BUILD)/bin/s3.exe: $(BUILD)/obj/s3.o $(BUILD)/obj/mingw_s3_functions.o \ $(BUILD)/lib/libs3.a -@mkdir $(subst /,\,$(dir $@)) - gcc -o $@ $^ $(CURL_LIBS) $(LIBXML2_LIBS) $(OPENSSL_LIBS) -lws2_32 + gcc -o $@ $^ $(LDFLAGS) -lws2_32 # -------------------------------------------------------------------------- |