Moved middleware into src/middleware

dmitriid · Sep 7, 2009 · 1329dcd · 1329dcd
1 parent 50ce29d
commit 1329dcd
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,6 @@
 all:
 	(cd src;$(MAKE))
+	(cd src/middleware;$(MAKE))
 	(cd deps/erlydtl/src;$(MAKE))
 	(cd deps/mochiweb/src;$(MAKE))
 	(cd deps/ewgi;$(MAKE))

diff --git a/src/middleware/Makefile b/src/middleware/Makefile
@@ -0,0 +1,12 @@
+
+INCLUDE_DIRS := ../../include
+EBIN_DIR := ../
+include ../../support/include.mk
+
+all: $(EBIN_FILES_NO_DOCS)
+
+debug:
+	$(MAKE) DEBUG=-DDEBUG
+
+clean:
+	rm -rf $(EBIN_FILES_NO_DOCS)
diff --git a/src/middleware/Makefile~ b/src/middleware/Makefile~
@@ -0,0 +1,9 @@
+include ../../support/include.mk
+
+all: $(EBIN_FILES_NO_DOCS)
+
+debug:
+	$(MAKE) DEBUG=-DDEBUG
+
+clean:
+	rm -rf $(EBIN_FILES_NO_DOCS)
diff --git a/src/beepbeep_session.erl → src/middleware/beepbeep_session.erl b/src/beepbeep_session.erl → src/middleware/beepbeep_session.erl
diff --git a/src/beepbeep_session_server.erl → src/middleware/beepbeep_session_server.erl b/src/beepbeep_session_server.erl → src/middleware/beepbeep_session_server.erl
diff --git a/support/include.mk b/support/include.mk
@@ -6,7 +6,7 @@
 ERL := erl
 ERLC := $(ERL)c
 
-INCLUDE_DIRS := ../include $(wildcard ../deps/*/include)
+INCLUDE_DIRS := $(INCLUDE_DIRS) ../include $(wildcard ../deps/*/include)
 EBIN_DIRS := $(wildcard ../deps/*/ebin)
 ERLC_FLAGS := -W $(INCLUDE_DIRS:../%=-I ../%) $(EBIN_DIRS:%=-pa %)
 
@@ -18,7 +18,7 @@ ifdef debug
   ERLC_FLAGS += -Ddebug
 endif
 
-EBIN_DIR := ../ebin
+EBIN_DIR := $(EBIN_DIR)../ebin
 DOC_DIR  := ../doc
 EMULATOR := beam