Update RPM.

diff --git a/Makefile.am b/Makefile.am
index d001031047c8c09b3b6963d943f8094b6e4c9539..895debbc01a83515345979683eec4401ec62dccd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -74,7 +74,7 @@ endif
 
 include libmemcachedinternal/include.am
 include libmemcachedinternal/util/include.am
-include rpm/include.am
+include rpm/include.mk
 include support/include.am
 include tests/include.am
 include util/include.am
@@ -96,7 +96,6 @@ merge-clean:
        @find ./ | $(GREP) \.moved | xargs rm -r -f
        @find ./ | $(GREP) \\.orig | xargs rm -f
        @find ./ | $(GREP) \.rej | xargs rm -f
-       @rm -f *\.rpm
        @find ./ | $(GREP) \.THIS | xargs rm -f
        @find ./ | $(GREP) \.OTHER | xargs rm -f
        @find ./ | $(GREP) \.BASE | xargs rm -f

diff --git a/rpm/include.am b/rpm/include.am
deleted file mode 100644 (file)
index 313a67c..0000000
--- a/rpm/include.am
+++ /dev/null
@@ -1,53 +0,0 @@
-# vim:ft=automake
-#
-
-RPM_BUILDDIR= ~/rpmbuild
-
-RPM_BUILD_TARGET= @PACKAGE@-@VERSION@-@RPM_RELEASE@.@build_cpu@.rpm
-RPM_SOURCE= $(RPM_BUILDDIR)/SOURCES/$(DIST_ARCHIVES)
-
-RPMS=
-RPMS+= $(RPM_BUILD_TARGET)
-RPMS+= @PACKAGE@-devel-@VERSION@-@RPM_RELEASE@.@build_cpu@.rpm
-RPMS+= @PACKAGE@-debuginfo-@VERSION@-@RPM_RELEASE@.@build_cpu@.rpm
-
-SRPMS= @PACKAGE@-@VERSION@-@RPM_RELEASE@.src.rpm
-
-RPM_DIST= $(RPMS) $(SRPMS)
-
-BUILD_RPMS= $(foreach rpm_iterator,$(RPMS),$(addprefix $(RPM_BUILDDIR)/RPMS/@build_cpu@/, $(rpm_iterator)))
-BUILD_SRPMS= $(foreach srpm_iterator,$(SRPMS),$(addprefix $(RPM_BUILDDIR)/SRPMS/, $(srpm_iterator)))
-BUILD_RPM_DIR= $(RPM_BUILDDIR)/BUILD/@PACKAGE@-@VERSION@
-
-$(RPM_BUILDDIR):
-       @@RPMDEV_SETUPTREE@
-
-$(DIST_ARCHIVES): $(DISTFILES)
-       $(MAKE) $(AM_MAKEFLAGS) dist-gzip
-
-$(RPM_SOURCE): | $(RPM_BUILDDIR) $(DIST_ARCHIVES)
-       @rm -f $(BUILD_RPMS) $(BUILD_SRPMS) $(BUILD_RPM_DIR)
-       @cp $(DIST_ARCHIVES) $(RPM_SOURCE)
-
-$(RPM_BUILD_TARGET): $(RPM_SOURCE) support/@PACKAGE@.spec
-       @@RPMBUILD@ -ba $(top_srcdir)/support/@PACKAGE@.spec
-       @cp $(BUILD_RPMS) $(BUILD_SRPMS) .
-
-.PHONY: rpm-sign
-rpm-sign: $(RPM_BUILD_TARGET)
-       @@RPM@ --addsign $(RPM_DIST)
-       @@RPM@ --checksig $(RPM_DIST)
-
-.PHONY: clean-rpm
-clean-rpm:
-       @rm -f $(BUILD_RPMS) $(BUILD_SRPMS) $(BUILD_RPM_SOURCE) $(BUILD_RPM_DIR) $(RPM_DIST)
-
-rpm: $(RPM_BUILD_TARGET)
-dist-rpm: $(RPM_BUILD_TARGET)
-
-.PHONY: release
-release: rpm rpm-sign
-
-.PHONY: auto-rpmbuild
-auto-rpmbuild: support/@PACKAGE@.spec
-       @auto-br-rpmbuild -ba $(top_srcdir)/support/@PACKAGE@.spec

diff --git a/rpm/include.mk b/rpm/include.mk
new file mode 100644 (file)
index 0000000..27b6bd0
--- /dev/null
+++ b/rpm/include.mk
@@ -0,0 +1,52 @@
+# vim:ft=automake
+
+RPM_BUILDDIR= ~/rpmbuild
+
+RPM_BUILD_TARGET= @PACKAGE@-@VERSION@-@RPM_RELEASE@.@build_cpu@.rpm
+RPM_SOURCE= $(RPM_BUILDDIR)/SOURCES/$(DIST_ARCHIVES)
+
+RPMS=
+RPMS+= $(RPM_BUILD_TARGET)
+RPMS+= @PACKAGE@-devel-@VERSION@-@RPM_RELEASE@.@build_cpu@.rpm
+RPMS+= @PACKAGE@-debuginfo-@VERSION@-@RPM_RELEASE@.@build_cpu@.rpm
+
+SRPMS= @PACKAGE@-@VERSION@-@RPM_RELEASE@.src.rpm
+
+RPM_DIST= $(RPMS) $(SRPMS)
+
+BUILD_RPMS= $(foreach rpm_iterator,$(RPMS),$(addprefix $(RPM_BUILDDIR)/RPMS/@build_cpu@/, $(rpm_iterator)))
+BUILD_SRPMS= $(foreach srpm_iterator,$(SRPMS),$(addprefix $(RPM_BUILDDIR)/SRPMS/, $(srpm_iterator)))
+BUILD_RPM_DIR= $(RPM_BUILDDIR)/BUILD/@PACKAGE@-@VERSION@
+
+$(RPM_BUILDDIR):
+       @@RPMDEV_SETUPTREE@
+
+$(DIST_ARCHIVES): $(DISTFILES)
+       $(MAKE) $(AM_MAKEFLAGS) dist-gzip
+
+$(RPM_SOURCE): | $(RPM_BUILDDIR) $(DIST_ARCHIVES)
+       @rm -f $(BUILD_RPMS) $(BUILD_SRPMS) $(BUILD_RPM_DIR)
+       @cp $(DIST_ARCHIVES) $(RPM_SOURCE)
+
+$(RPM_BUILD_TARGET): $(RPM_SOURCE) support/@PACKAGE@.spec
+       @@RPMBUILD@ -ba $(top_srcdir)/support/@PACKAGE@.spec
+       @cp $(BUILD_RPMS) $(BUILD_SRPMS) .
+
+.PHONY: rpm-sign
+rpm-sign: $(RPM_BUILD_TARGET)
+       @@RPM@ --addsign $(RPM_DIST)
+       @@RPM@ --checksig $(RPM_DIST)
+
+.PHONY: clean-rpm
+clean-rpm:
+       -@rm -f $(BUILD_RPMS) $(BUILD_SRPMS) $(BUILD_RPM_SOURCE) $(BUILD_RPM_DIR) $(RPM_DIST)
+
+rpm: $(RPM_BUILD_TARGET)
+dist-rpm: $(RPM_BUILD_TARGET)
+
+.PHONY: release
+release: rpm rpm-sign
+
+.PHONY: auto-rpmbuild
+auto-rpmbuild: support/@PACKAGE@.spec
+       @auto-br-rpmbuild -ba $(top_srcdir)/support/@PACKAGE@.spec