diff options
| author | Lukas Larsson <[email protected]> | 2012-05-30 18:57:37 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2012-05-30 18:57:37 +0200 |
| commit | ac20ee2a68c632ab44f8c6ba151fa37600221288 (patch) | |
| tree | 2d1f509d7b64da745521873427e4a7a35f748260 /lib/mnesia/test/Makefile | |
| parent | ecb81c21bfa0d822493412b7a0d2a6738ca7261a (diff) | |
| parent | 4535d409f75eeeb0e36b53f3a59d4f6e6f9529d1 (diff) | |
| download | otp-ac20ee2a68c632ab44f8c6ba151fa37600221288.tar.gz otp-ac20ee2a68c632ab44f8c6ba151fa37600221288.tar.bz2 otp-ac20ee2a68c632ab44f8c6ba151fa37600221288.zip | |
Merge branch 'maint'
* maint:
Fix compilation of examples and tc names on windows
Create erl.ini for host emulator
Diffstat (limited to 'lib/mnesia/test/Makefile')
| -rw-r--r-- | lib/mnesia/test/Makefile | 28 |
1 files changed, 18 insertions, 10 deletions
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: |