diff options
| author | Bryan Ischo <bryan@ischo.com> | 2008-08-06 21:28:05 +0000 |
|---|---|---|
| committer | Bryan Ischo <bryan@ischo.com> | 2008-08-06 21:28:05 +0000 |
| commit | 744c19acf5d8dd7c02193bf3fafd2e6a548f43e4 (patch) | |
| tree | 73df64b54066c1743b0c76c1b05569765949c869 /GNUmakefile | |
| parent | c6741b1e2e3a6e7b5a46998247f7fd24046499db (diff) | |
| download | ceph-libs3-744c19acf5d8dd7c02193bf3fafd2e6a548f43e4.tar.gz | |
* Made -O3 default compiler option
* Minor changes to libs3.spec
* Fixed debian stuff that was polluting non-debian builds
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/GNUmakefile b/GNUmakefile index 6ef4966..12af93b 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -82,6 +82,10 @@ endif # which converts these arguments into their equivalent for that particular # compiler. +ifndef CFLAGS + CFLAGS = -O3 +endif + CFLAGS += -Wall -Werror -std=c99 -Iinc $(CURL_CFLAGS) $(LIBXML2_CFLAGS) \ -DLIBS3_VER_MAJOR=$(LIBS3_VER_MAJOR) \ -DLIBS3_VER_MINOR=$(LIBS3_VER_MINOR) @@ -125,12 +129,13 @@ uninstall: # -------------------------------------------------------------------------- # Debian package target -DEBARCH = $(shell dpkg-architecture | grep ^DEB_BUILD_ARCH= | cut -d '=' -f 2) -DEBPKG = $(BUILD)/pkg/libs3_$(LIBS3_VER)_$(DEBARCH).deb +DEBPKG = $(BUILD)/pkg/libs3_$(LIBS3_VER).deb .PHONY: deb deb: $(DEBPKG) +$(DEBPKG): DEBARCH = $(shell dpkg-architecture | grep ^DEB_BUILD_ARCH= | \ + cut -d '=' -f 2) $(DEBPKG): exported $(BUILD)/deb/DEBIAN/control $(BUILD)/deb/DEBIAN/shlibs \ $(BUILD)/deb/DEBIAN/postinst \ $(BUILD)/deb/usr/share/doc/libs3/changelog.gz \ @@ -139,6 +144,7 @@ $(DEBPKG): exported $(BUILD)/deb/DEBIAN/control $(BUILD)/deb/DEBIAN/shlibs \ DESTDIR=$(BUILD)/deb/usr $(MAKE) install @mkdir -p $(dir $@) fakeroot dpkg-deb -b $(BUILD)/deb $@ + mv $@ $(BUILD)/pkg/libs3_$(LIBS3_VER)_$(DEBARCH).deb $(BUILD)/deb/DEBIAN/control: debian/control @mkdir -p $(dir $@) |