You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
84 lines
3.1 KiB
84 lines
3.1 KiB
12 years ago
|
GNUmakefile | 23 ++++++++++++-----------
|
||
|
1 file changed, 12 insertions(+), 11 deletions(-)
|
||
|
|
||
|
diff --git a/GNUmakefile b/GNUmakefile
|
||
|
index 36398c1..dc24843 100644
|
||
|
--- a/GNUmakefile
|
||
|
+++ b/GNUmakefile
|
||
|
@@ -60,7 +60,7 @@ LIBS3_VER := $(LIBS3_VER_MAJOR).$(LIBS3_VER_MINOR)
|
||
|
# any value, then verbosity is turned on". So don't define VERBOSE if you
|
||
|
# don't want verbosity in the build process.
|
||
|
# -----------------------------------------------------------------------------
|
||
|
-
|
||
|
+VERBOSE = true
|
||
|
ifdef VERBOSE
|
||
|
VERBOSE = true
|
||
|
VERBOSE_ECHO = @ echo
|
||
|
@@ -125,7 +125,7 @@ ifndef CFLAGS
|
||
|
endif
|
||
|
endif
|
||
|
|
||
|
-CFLAGS += -Wall -Werror -Wshadow -Wextra -Iinc \
|
||
|
+CFLAGS += -Wall -Wshadow -Wextra -Iinc \
|
||
|
$(CURL_CFLAGS) $(LIBXML2_CFLAGS) \
|
||
|
-DLIBS3_VER_MAJOR=\"$(LIBS3_VER_MAJOR)\" \
|
||
|
-DLIBS3_VER_MINOR=\"$(LIBS3_VER_MINOR)\" \
|
||
|
@@ -134,7 +134,8 @@ CFLAGS += -Wall -Werror -Wshadow -Wextra -Iinc \
|
||
|
-D_ISOC99_SOURCE \
|
||
|
-D_POSIX_C_SOURCE=200112L
|
||
|
|
||
|
-LDFLAGS = $(CURL_LIBS) $(LIBXML2_LIBS) -lpthread
|
||
|
+LDFLAGS += -lpthread
|
||
|
+LIBS = $(CURL_LIBS) $(LIBXML2_LIBS)
|
||
|
|
||
|
|
||
|
# --------------------------------------------------------------------------
|
||
|
@@ -157,11 +158,11 @@ exported: libs3 s3 headers
|
||
|
.PHONY: install
|
||
|
install: exported
|
||
|
$(QUIET_ECHO) $(DESTDIR)/bin/s3: Installing executable
|
||
|
- $(VERBOSE_SHOW) install -Dps -m u+rwx,go+rx $(BUILD)/bin/s3 \
|
||
|
+ $(VERBOSE_SHOW) install -Dp -m u+rwx,go+rx $(BUILD)/bin/s3 \
|
||
|
$(DESTDIR)/bin/s3
|
||
|
$(QUIET_ECHO) \
|
||
|
$(DESTDIR)/lib/libs3.so.$(LIBS3_VER): Installing shared library
|
||
|
- $(VERBOSE_SHOW) install -Dps -m u+rw,go+r \
|
||
|
+ $(VERBOSE_SHOW) install -Dp -m u+rw,go+r \
|
||
|
$(BUILD)/lib/libs3.so.$(LIBS3_VER_MAJOR) \
|
||
|
$(DESTDIR)/lib/libs3.so.$(LIBS3_VER)
|
||
|
$(QUIET_ECHO) \
|
||
|
@@ -199,18 +200,18 @@ uninstall:
|
||
|
$(BUILD)/obj/%.o: src/%.c
|
||
|
$(QUIET_ECHO) $@: Compiling object
|
||
|
@ mkdir -p $(dir $(BUILD)/dep/$<)
|
||
|
- @ gcc $(CFLAGS) -M -MG -MQ $@ -DCOMPILINGDEPENDENCIES \
|
||
|
+ $(CC) $(CFLAGS) -M -MG -MQ $@ -DCOMPILINGDEPENDENCIES \
|
||
|
-o $(BUILD)/dep/$(<:%.c=%.d) -c $<
|
||
|
@ mkdir -p $(dir $@)
|
||
|
- $(VERBOSE_SHOW) gcc $(CFLAGS) -o $@ -c $<
|
||
|
+ $(VERBOSE_SHOW) $(CC) $(CFLAGS) -o $@ -c $<
|
||
|
|
||
|
$(BUILD)/obj/%.do: src/%.c
|
||
|
$(QUIET_ECHO) $@: Compiling dynamic object
|
||
|
@ mkdir -p $(dir $(BUILD)/dep/$<)
|
||
|
- @ gcc $(CFLAGS) -M -MG -MQ $@ -DCOMPILINGDEPENDENCIES \
|
||
|
+ $(CC) $(CFLAGS) -M -MG -MQ $@ -DCOMPILINGDEPENDENCIES \
|
||
|
-o $(BUILD)/dep/$(<:%.c=%.dd) -c $<
|
||
|
@ mkdir -p $(dir $@)
|
||
|
- $(VERBOSE_SHOW) gcc $(CFLAGS) -fpic -fPIC -o $@ -c $<
|
||
|
+ $(VERBOSE_SHOW) $(CC) $(CFLAGS) -fpic -fPIC -o $@ -c $<
|
||
|
|
||
|
|
||
|
# --------------------------------------------------------------------------
|
||
|
@@ -230,8 +231,8 @@ LIBS3_SOURCES := acl.c bucket.c error_parser.c general.c \
|
||
|
$(LIBS3_SHARED): $(LIBS3_SOURCES:%.c=$(BUILD)/obj/%.do)
|
||
|
$(QUIET_ECHO) $@: Building shared library
|
||
|
@ mkdir -p $(dir $@)
|
||
|
- $(VERBOSE_SHOW) gcc -shared -Wl,-soname,libs3.so.$(LIBS3_VER_MAJOR) \
|
||
|
- -o $@ $^ $(LDFLAGS)
|
||
|
+ $(VERBOSE_SHOW) $(CC) $(LDFLAGS) -shared -Wl,-soname,libs3.so.$(LIBS3_VER_MAJOR) \
|
||
|
+ -o $@ $^ $(LIBS)
|
||
|
|
||
|
$(LIBS3_STATIC): $(LIBS3_SOURCES:%.c=$(BUILD)/obj/%.o)
|
||
|
$(QUIET_ECHO) $@: Building static library
|