From 4e479e4ef1cb5888b21a07047b8cd67ac3276172 Mon Sep 17 00:00:00 2001
From: Yuto Hayamizu <y.hayamizu@gmail.com>
Date: Tue, 15 Dec 2009 04:35:17 +0900
Subject: [PATCH] merged errorneously added Makefile

---
 Makefile | 20 +++++++++++++++++++-
 makefile | 21 ---------------------
 2 files changed, 19 insertions(+), 22 deletions(-)
 delete mode 100644 makefile

diff --git a/Makefile b/Makefile
index c3dc32f8..976b774a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,25 @@
 
-.PHONY: all update-po
+EMACS ?= emacs
+
+.PHONY: all unit-test clean update-po
 
 all:
 
 update-po:
 	$(MAKE) -C doc update-po
+
+# batchtest : twittering-mode.el
+# 	$(EMACS21) --no-init-file --batch -f batch-byte-compile twittering-mode.el
+# 	rm twittering-mode.elc
+# 	$(EMACS22) --no-init-file --batch -f batch-byte-compile twittering-mode.el
+# 	rm twittering-mode.elc
+# 
+# test : twittering-mode.el
+# 	$(EMACS21) -q -l local.test-emacs21.el &
+# 	$(EMACS22) -q -l local.test-emacs22.el &
+
+unit-test: test/run-test.el
+	$(EMACS) --batch -Q -l $<
+
+clean : 
+	rm twittering-mode.elc
diff --git a/makefile b/makefile
deleted file mode 100644
index 86b05a78..00000000
--- a/makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-
-.PHONY: unit-test clean
-
-EMACS ?= emacs
-
-# batchtest : twittering-mode.el
-# 	$(EMACS21) --no-init-file --batch -f batch-byte-compile twittering-mode.el
-# 	rm twittering-mode.elc
-# 	$(EMACS22) --no-init-file --batch -f batch-byte-compile twittering-mode.el
-# 	rm twittering-mode.elc
-# 
-# test : twittering-mode.el
-# 	$(EMACS21) -q -l local.test-emacs21.el &
-# 	$(EMACS22) -q -l local.test-emacs22.el &
-
-unit-test: test/run-test.el
-	$(EMACS) --batch -Q -l $<
-
-clean : 
-	rm twittering-mode.elc
-