diff options
| author | Anders Svensson <[email protected]> | 2012-11-08 12:55:44 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2012-11-08 12:55:44 +0100 |
| commit | 1262a7cadb69ee503bb5c2586038059b00595c99 (patch) | |
| tree | a62327809e844a7a9d08f20a7d1f51754bb6b8b0 /lib/diameter/src/Makefile | |
| parent | acdfec8baf27093b59cd25ffbc84e6165f9bb427 (diff) | |
| parent | bcc2e7751b014d4fc9d45c4a138278cbd00cc222 (diff) | |
| download | otp-1262a7cadb69ee503bb5c2586038059b00595c99.tar.gz otp-1262a7cadb69ee503bb5c2586038059b00595c99.tar.bz2 otp-1262a7cadb69ee503bb5c2586038059b00595c99.zip | |
Merge branch 'anders/diameter/sequence_masks/OTP-10445' into maint
* anders/diameter/sequence_masks/OTP-10445:
Redo watchdog test suite
Update/clarify some comments
Add reopen message from watchdog
Add options service_info
Add diameter_reg:wait/1
Clarify diameter_transport doc
Remove pre-OTP configure support
Remove obsolete make target
Use sequence masks in test suites
Implement sequence masks
Document sequence masks
Diffstat (limited to 'lib/diameter/src/Makefile')
| -rw-r--r-- | lib/diameter/src/Makefile | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile index 99c343275b..060659bce9 100644 --- a/lib/diameter/src/Makefile +++ b/lib/diameter/src/Makefile @@ -16,13 +16,8 @@ # # %CopyrightEnd% -ifeq ($(ERL_TOP),) -include $(DIAMETER_TOP)/make/target.mk -include $(DIAMETER_TOP)/make/$(TARGET)/rules.mk -else include $(ERL_TOP)/make/target.mk include $(ERL_TOP)/make/$(TARGET)/otp.mk -endif # ---------------------------------------------------- # Application version @@ -210,11 +205,7 @@ dialyze: opt $(PLT) # Release targets # ---------------------------------------------------- -ifeq ($(ERL_TOP),) -include $(DIAMETER_TOP)/make/release_targets.mk -else include $(ERL_TOP)/make/otp_release_targets.mk -endif # Can't $(INSTALL_DIR) more than one directory at a time on Solaris. |