Merge from default

rabbitmq · Dec 2, 2010 · 50043d1 · 50043d1
2 parents 8ed630a + 1bd40f6
commit 50043d1
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 52 deletions.
diff --git a/.hgignore b/.hgignore
@@ -1,12 +1,7 @@
 ^ebin/.*\.beam$
-^plugin-include\.mk$
-^build$
 ^dist$
-^deps/erlang-smtp/erlang-smtp$
-^deps/erlang-smtp/erlang-smtp-git$
-^deps/erlang-smtp/ebin$
-^deps/erlang-smtp/include$
-^deps/erlang-smtp/erlang-smtp\.ez$
+^ebin/rabbitmq_smtp_server.app$
+^deps.mk$
 
 ^tmp/.*\.(LOG|DCD|DAT)$
 ^tmp/rabbit_persister\.LOG(|\.previous)$

diff --git a/Makefile b/Makefile
@@ -1,12 +1 @@
-PACKAGE=rabbitmq-smtp
-APPNAME=rabbitmq_smtp_server
-DEPS=rabbitmq-server rabbitmq-erlang-client
-INTERNAL_DEPS=erlang-smtp
-TEST_APPS=rabbitmq_smtp_server
-START_RABBIT_IN_TESTS=true
-TEST_SCRIPTS=spec/run-specs.sh
-
 include ../include.mk
-
-clean::
-	rm -rf tmp
diff --git a/deps/erlang-smtp/Makefile b/deps/erlang-smtp/Makefile
diff --git a/ebin/rabbitmq_smtp_server.app.in → ebin/rabbitmq_smtp_server_app.in b/ebin/rabbitmq_smtp_server.app.in → ebin/rabbitmq_smtp_server_app.in
diff --git a/package.mk b/package.mk
@@ -0,0 +1,3 @@
+APP_NAME:=rabbitmq_smtp_server
+DEPS:=rabbitmq-server rabbitmq-erlang-client erlang-smtp-wrapper
+TEST_SCRIPTS:=spec/run-specs.sh