Add a top GNUMakefile to make things happen by default.

diff --git a/.quickly b/.quickly
deleted file mode 100644 (file)
index 637e364..0000000
--- a/.quickly
+++ /dev/null
@@ -1,5 +0,0 @@
-project = libmemcached
-version = 0.4.2
-template = pandora-build
-project-type = library
-pandora-version = 0.175

diff --git a/GNUmakefile b/GNUmakefile
new file mode 100644 (file)
index 0000000..33ec5ac
--- /dev/null
+++ b/GNUmakefile
@@ -0,0 +1,36 @@
+# -*-Makefile-*-
+#
+_bootstrap_Makefile := $(wildcard [M]akefile)
+_bootstrap_config-status := $(wildcard config.status)
+
+ALL_RECURSIVE_TARGETS=
+
+ifneq ($(_bootstrap_Makefile),)
+  include Makefile
+else
+  ifneq ($(_bt_config-status),)
+    $(srcdir)/config.status
+    $(MAKE) $(AM_MAKEFLAGS) configure
+  endif
+
+.DEFAULT_GOAL:= basic_build
+srcdir= .
+
+configure: bootstrap.sh
+       @$(srcdir)/bootstrap.sh -a
+
+Makefile: configure
+       @$(srcdir)/bootstrap.sh -c
+
+.PHONY: basic_build
+basic_build: Makefile
+       @$(MAKE) $(AM_MAKEFLAGS)
+endif
+
+ALL_RECURSIVE_TARGETS+= $(AM_RECURSIVE_TARGETS)
+
+ifneq ($(word 2, $(MAKECMDGOALS)), )
+ifneq ($(filter $(ALL_RECURSIVE_TARGETS), $(MAKECMDGOALS)), )
+.NOTPARALLEL:
+endif
+endif

diff --git a/Makefile.am b/Makefile.am
index cc65cb781bbbb5fbe9e9f1101397d99a8886eda2..7432e682d45d3cb5fe2dbc429892d5cc7c8e7c47 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,7 +31,6 @@ MAINTAINERCLEANFILES=
 
 DISTCLEANFILES+= aminclude.am
 
 
 DISTCLEANFILES+= aminclude.am
 

-EXTRA_DIST+= .quickly

 EXTRA_DIST+= README.FIRST
 EXTRA_DIST+= README.win32
 
 EXTRA_DIST+= README.FIRST
 EXTRA_DIST+= README.win32
 


@@ -152,5 +151,7 @@ maintainer-clean-local:
        -rm -f m4/ltsugar.m4
        -rm -f m4/ltversion.m4
        -rm -f m4/lt~obsolete.m4
        -rm -f m4/ltsugar.m4
        -rm -f m4/ltversion.m4
        -rm -f m4/lt~obsolete.m4

+       -rm -f m4/test-driver

        -rmdir build-aux
        -rm -rf ${top_builddir}/html
        -rmdir build-aux
        -rm -rf ${top_builddir}/html

+       -rm -f bootstrap