diff options
| author | Erlang/OTP <[email protected]> | 2010-03-16 06:54:37 +0000 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-03-16 06:54:37 +0000 |
| commit | 7a18238092f56b6c49c1fa798fa5b3858dbce5cc (patch) | |
| tree | bdc73c3a8fd680a016985e5a4984f74510fc1dde /lib/asn1/test/Makefile | |
| parent | 3aa73b1a0345c0ce851081567c220697eeba4233 (diff) | |
| parent | 878f36c7a66e8f7459de660bf2713fb1f75c2dfb (diff) | |
| download | otp-7a18238092f56b6c49c1fa798fa5b3858dbce5cc.tar.gz otp-7a18238092f56b6c49c1fa798fa5b3858dbce5cc.tar.bz2 otp-7a18238092f56b6c49c1fa798fa5b3858dbce5cc.zip | |
Merge branch 'bg/asn1-tests' into dev
* bg/asn1-tests:
asn1 tests: Let ts:run() build the tests
asn1 tests: No longer tolerate compilation warnings
asn1 tests: Eliminate use of deprecated concat_binary/1
asn1 tests: Eliminate warning for an unused variable
asn1 tests: Modernize guard tests
asn1 tests: Clean up comments
asn1 tests: Don't refer to $ERL_TOP in compiler options
OTP-8520 bg/asn1-tests
Diffstat (limited to 'lib/asn1/test/Makefile')
| -rw-r--r-- | lib/asn1/test/Makefile | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/lib/asn1/test/Makefile b/lib/asn1/test/Makefile index 879e51c632..5014eb902b 100644 --- a/lib/asn1/test/Makefile +++ b/lib/asn1/test/Makefile @@ -133,9 +133,7 @@ ERL_FILES= $(MODULES:%=%.erl) HRL_FILES= External.hrl -TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR)) - -INSTALL_PROGS= $(TARGET_FILES) +EMAKEFILE=Emakefile # ---------------------------------------------------- # Release directory specification @@ -145,19 +143,20 @@ RELSYSDIR = $(RELEASE_PATH)/asn1_test # ---------------------------------------------------- # FLAGS # ---------------------------------------------------- -ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/test_server/include \ - -I$(ERL_TOP)/lib/kernel/include - +ERL_COMPILE_FLAGS += +warnings_as_errors EBIN = . # ---------------------------------------------------- # Targets # ---------------------------------------------------- -tests debug opt: $(TARGET_FILES) $(SUITE) $(SUITE_BIN) $(SUITE_BIN_V2) +$(EMAKEFILE): $(ERL_FILES) $(HRL_FILES) + $(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) $(MODULES) $(ERL_FILES) >$(EMAKEFILE) + +tests debug opt: $(SUITE) $(SUITE_BIN) $(SUITE_BIN_V2) $(EMAKEFILE) clean: - rm -f $(TARGET_FILES) $(SUITE) $(SUITE_BIN) $(SUITE_BIN_V2) + rm -f $(SUITE) $(SUITE_BIN) $(SUITE_BIN_V2) rm -f core docs: @@ -190,8 +189,7 @@ release_spec: opt release_tests_spec: opt $(INSTALL_DIR) $(RELSYSDIR) - $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR) - $(INSTALL_DATA) asn1.spec $(INSTALL_PROGS) $(RELSYSDIR) + $(INSTALL_DATA) asn1.spec $(EMAKEFILE) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR) chmod -f -R u+w $(RELSYSDIR) @tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -) $(INSTALL_DIR) $(RELSYSDIR)/asn1_bin_SUITE_data |