summaryrefslogtreecommitdiff
path: root/GNUmakefile
diff options
context:
space:
mode:
authorBryan Ischo <bji@lolita.(none)>2009-01-21 01:13:29 +1300
committerBryan Ischo <bji@lolita.(none)>2009-01-21 01:13:29 +1300
commit2cd111102556c61cff57f12f365b8331b4af9459 (patch)
tree00ab13a3c05ba3bb4d683045387e13f33716dcab /GNUmakefile
parent0e365b75c7b3a63e4ddfcb8ce201c5c21d28a7e4 (diff)
parent203d33fdb7778080865879fb173f52009652fbd7 (diff)
downloadceph-libs3-2cd111102556c61cff57f12f365b8331b4af9459.tar.gz
Merge commit 'trunk'
Diffstat (limited to 'GNUmakefile')
-rw-r--r--GNUmakefile8
1 files changed, 5 insertions, 3 deletions
diff --git a/GNUmakefile b/GNUmakefile
index 3f8f86b..5b7c1a5 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -86,7 +86,7 @@ ifndef CFLAGS
CFLAGS = -O3
endif
-CFLAGS += -Wall -Werror -std=c99 -Iinc \
+CFLAGS += -Wall -Werror -Wshadow -Wextra -std=c99 -Iinc \
$(CURL_CFLAGS) $(LIBXML2_CFLAGS) \
-DLIBS3_VER_MAJOR=\"$(LIBS3_VER_MAJOR)\" \
-DLIBS3_VER_MINOR=\"$(LIBS3_VER_MINOR)\" \
@@ -121,6 +121,7 @@ install: libs3 s3 headers
install -Dps -m u+rw,go+r $(BUILD)/lib/libs3.so.$(LIBS3_VER_MAJOR) \
$(DESTDIR)/lib/libs3.so.$(LIBS3_VER)
ln -sf libs3.so.$(LIBS3_VER) $(DESTDIR)/lib/libs3.so.$(LIBS3_VER_MAJOR)
+ ln -sf libs3.so.$(LIBS3_VER_MAJOR) $(DESTDIR)/lib/libs3.so
# --------------------------------------------------------------------------
@@ -131,6 +132,7 @@ uninstall:
rm -f $(DESTDIR)/bin/s3 \
$(DESTDIR)/include/libs3.h \
$(DESTDIR)/lib/libs3.a \
+ $(DESTDIR)/lib/libs3.so \
$(DESTDIR)/lib/libs3.so.$(LIBS3_VER_MAJOR) \
$(DESTDIR)/lib/libs3.so.$(LIBS3_VER) \
@@ -249,8 +251,8 @@ libs3: $(LIBS3_SHARED) $(LIBS3_SHARED_MAJOR) $(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 \
- src/response_headers_handler.c src/service.c \
- src/simplexml.c src/util.c
+ src/response_headers_handler.c src/service_access_logging.c \
+ src/service.c src/simplexml.c src/util.c
$(LIBS3_SHARED): $(LIBS3_SOURCES:src/%.c=$(BUILD)/obj/%.do)
@mkdir -p $(dir $@)