diff options
| author | Bruce Yinhe <[email protected]> | 2014-09-26 12:17:56 +0200 |
|---|---|---|
| committer | Bruce Yinhe <[email protected]> | 2014-09-26 12:33:18 +0200 |
| commit | 1f833958bc4142b9cc3d6804763d0653460c3e69 (patch) | |
| tree | 100cf05f2db28866db3b7761d04f36258c14870d | |
| parent | 2397a14d1113bc2d334dee908269cf3b63c46314 (diff) | |
| parent | 61c9499fbe7eeb6165febd100280d0e089904280 (diff) | |
| download | otp-1f833958bc4142b9cc3d6804763d0653460c3e69.tar.gz otp-1f833958bc4142b9cc3d6804763d0653460c3e69.tar.bz2 otp-1f833958bc4142b9cc3d6804763d0653460c3e69.zip | |
Merge branch 'matwey/makefile' into maint
OTP-12200
* matwey/makefile:
Cleanup parse_transform modules in eunit
Cleanup behaviour modules in ssl
Cleanup behaviour modules in ssh
Fix a typo in clean section of otp_mibs makefile
| -rw-r--r-- | lib/eunit/src/Makefile | 2 | ||||
| -rw-r--r-- | lib/otp_mibs/src/Makefile | 2 | ||||
| -rw-r--r-- | lib/ssh/src/Makefile | 2 | ||||
| -rw-r--r-- | lib/ssl/src/Makefile | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/lib/eunit/src/Makefile b/lib/eunit/src/Makefile index 82bd64c914..47aef104ff 100644 --- a/lib/eunit/src/Makefile +++ b/lib/eunit/src/Makefile @@ -80,7 +80,7 @@ all: $(OBJECTS) clean: - rm -f $(OBJECTS) + rm -f $(OBJECTS) $(PARSE_TRANSFORM_BIN) rm -f core *~ distclean: clean diff --git a/lib/otp_mibs/src/Makefile b/lib/otp_mibs/src/Makefile index 4f03d0228a..6096240bbd 100644 --- a/lib/otp_mibs/src/Makefile +++ b/lib/otp_mibs/src/Makefile @@ -72,7 +72,7 @@ ERL_COMPILE_FLAGS += -I$(INCLUDE) +warn_obsolete_guard debug opt: $(TARGETS) clean: - rm -f $(TARGETS_FILES) + rm -f $(TARGET_FILES) rm -f $(APP_TARGET) rm -f $(APPUP_TARGET) rm -f core diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile index 2ef2859fd7..53c755d3cb 100644 --- a/lib/ssh/src/Makefile +++ b/lib/ssh/src/Makefile @@ -115,7 +115,7 @@ $(TARGET_FILES): $(BEHAVIOUR_TARGET_FILES) debug opt: $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) clean: - rm -f $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) + rm -f $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(BEHAVIOUR_TARGET_FILES) rm -f errs core *~ $(APP_TARGET): $(APP_SRC) ../vsn.mk diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile index 7c4c8ec2cc..0c00a650b9 100644 --- a/lib/ssl/src/Makefile +++ b/lib/ssl/src/Makefile @@ -118,7 +118,7 @@ $(TARGET_FILES): $(BEHAVIOUR_TARGET_FILES) debug opt: $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) clean: - rm -f $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) + rm -f $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(BEHAVIOUR_TARGET_FILES) rm -f errs core *~ $(APP_TARGET): $(APP_SRC) ../vsn.mk |