diff options
| author | Bryan Ischo <bji@lolita.(none)> | 2009-02-12 08:40:03 +1300 |
|---|---|---|
| committer | Bryan Ischo <bji@lolita.(none)> | 2009-02-12 08:40:03 +1300 |
| commit | 48b37dceec73492bfaf397e6a9ced39b5fc3e29d (patch) | |
| tree | 1aab702aab988315d89aaace35f0eaedba367d53 /GNUmakefile | |
| parent | a079a19e63e922b3f156c34eab841c82be638316 (diff) | |
| download | ceph-libs3-48b37dceec73492bfaf397e6a9ced39b5fc3e29d.tar.gz | |
* Added support for Mac OS X
* Fixed a few minor comment issues and some small makefile issues
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/GNUmakefile b/GNUmakefile index d69e915..eb16954 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -86,11 +86,14 @@ ifndef CFLAGS CFLAGS = -O3 endif -CFLAGS += -Wall -Werror -Wshadow -Wextra -std=c99 -Iinc \ +CFLAGS += -Wall -Werror -Wshadow -Wextra -Iinc \ $(CURL_CFLAGS) $(LIBXML2_CFLAGS) \ -DLIBS3_VER_MAJOR=\"$(LIBS3_VER_MAJOR)\" \ -DLIBS3_VER_MINOR=\"$(LIBS3_VER_MINOR)\" \ - -DLIBS3_VER=\"$(LIBS3_VER)\" + -DLIBS3_VER=\"$(LIBS3_VER)\" \ + -D__STRICT_ANSI__ \ + -D_ISOC99_SOURCE \ + -D_POSIX_C_SOURCE=200112L LDFLAGS = $(CURL_LIBS) $(LIBXML2_LIBS) -lpthread @@ -113,7 +116,7 @@ exported: libs3 s3 headers # Install target .PHONY: install -install: libs3 s3 headers +install: exported install -Dps -m u+rwx,go+rx $(BUILD)/bin/s3 $(DESTDIR)/bin/s3 install -Dp -m u+rw,go+r $(BUILD)/include/libs3.h \ $(DESTDIR)/include/libs3.h @@ -247,7 +250,7 @@ $(BUILD)/obj/%.do: src/%.c LIBS3_SHARED = $(BUILD)/lib/libs3.so.$(LIBS3_VER_MAJOR) .PHONY: libs3 -libs3: $(LIBS3_SHARED) $(LIBS3_SHARED_MAJOR) $(BUILD)/lib/libs3.a +libs3: $(LIBS3_SHARED) $(BUILD)/lib/libs3.a LIBS3_SOURCES := src/acl.c src/bucket.c src/error_parser.c src/general.c \ src/object.c src/request.c src/request_context.c \ @@ -256,8 +259,7 @@ LIBS3_SOURCES := src/acl.c src/bucket.c src/error_parser.c src/general.c \ $(LIBS3_SHARED): $(LIBS3_SOURCES:src/%.c=$(BUILD)/obj/%.do) @mkdir -p $(dir $@) - gcc -shared -Wl,-soname,libs3.so.$(LIBS3_VER_MAJOR) -o $@ $^ \ - $(S3_LIBS) $(LDFLAGS) + gcc -shared -Wl,-soname,libs3.so.$(LIBS3_VER_MAJOR) -o $@ $^ $(LDFLAGS) $(BUILD)/lib/libs3.a: $(LIBS3_SOURCES:src/%.c=$(BUILD)/obj/%.o) @mkdir -p $(dir $@) |