From ab960374d77e7b7a21282017ecef99e21993fb76 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang-solutions.com>
Date: Wed, 16 May 2012 15:13:45 +0200
Subject: Fix compilation of examples and tc names on windows

---
 lib/mnesia/test/Makefile | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

(limited to 'lib/mnesia/test/Makefile')

diff --git a/lib/mnesia/test/Makefile b/lib/mnesia/test/Makefile
index ae4c9626c7..f041fef85b 100644
--- a/lib/mnesia/test/Makefile
+++ b/lib/mnesia/test/Makefile
@@ -52,24 +52,29 @@ MODULES= \
 	mnesia_cost \
 	mnesia_dbn_meters 
 
-MnesiaExamplesDir := ../examples
+DocExamplesDir := ../doc/src/
 
-ExampleModules =  \
+DocExampleModules =  \
 	company \
 	company_o \
-	bup \
-	mnesia_meter \
-	mnesia_tpcb       
-ExamplesHrl = \
+	bup
+
+DocExamplesHrl = \
 	company.hrl \
 	company_o.hrl
 
-ERL_FILES= $(MODULES:%=%.erl) $(ExampleModules:%=$(MnesiaExamplesDir)/%.erl)
+ExamplesDir := ../examples/
+
+ExampleModules = \
+	mnesia_meter \
+	mnesia_tpcb
 
-HRL_FILES= mnesia_test_lib.hrl $(ExamplesHrl:%=$(MnesiaExamplesDir)/%)
+ERL_FILES= $(MODULES:%=%.erl) $(DocExampleModules:%=$(DocExamplesDir)/%.erl) $(ExampleModules:%=$(ExamplesDir)/%.erl)
+
+HRL_FILES= mnesia_test_lib.hrl $(DocExamplesHrl:%=$(DocExamplesDir)/%)
 
 TARGET_FILES= \
-	$(MODULES:%=$(EBIN)/%.$(EMULATOR)) $(ExampleModules:%=$(EBIN)/%.$(EMULATOR)) 
+	$(MODULES:%=$(EBIN)/%.$(EMULATOR)) $(DocExampleModules:%=$(EBIN)/%.$(EMULATOR)) $(ExampleModules:%=$(EBIN)/%.$(EMULATOR))
 
 INSTALL_PROGS= $(TARGET_FILES)
 
@@ -91,7 +96,10 @@ EBIN = .
 
 tests debug opt: $(TARGET_FILES)
 
-$(EBIN)/%.beam: $(MnesiaExamplesDir)/%.erl
+$(EBIN)/%.beam: $(DocExamplesDir)/%.erl
+	$(ERLC) -bbeam $(ERL_COMPILE_FLAGS) -o$(EBIN) $<
+
+$(EBIN)/%.beam: $(ExamplesDir)/%.erl
 	$(ERLC) -bbeam $(ERL_COMPILE_FLAGS) -o$(EBIN) $<
 
 clean:
-- 
cgit v1.2.3