|
 |
eeecf7 |
From: Peter Lemenkov <lemenkov@gmail.com>
|
|
|
eeecf7 |
Date: Tue, 26 Aug 2014 13:53:49 +0400
|
|
|
eeecf7 |
Subject: [PATCH] Install internal hrl files when necessary
|
|
|
eeecf7 |
|
|
|
eeecf7 |
Sometimes we install *.erl files. Some these files include a private
|
|
|
eeecf7 |
*.hrl files, so in order to make these *.erl files usable we have to
|
|
|
eeecf7 |
install these private includes as well.
|
|
|
eeecf7 |
|
|
|
eeecf7 |
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
|
|
|
eeecf7 |
|
|
|
eeecf7 |
Conflicts:
|
|
|
eeecf7 |
lib/eunit/src/Makefile
|
|
|
eeecf7 |
lib/percept/src/Makefile
|
|
|
eeecf7 |
lib/test_server/src/Makefile
|
|
|
eeecf7 |
|
|
|
eeecf7 |
diff --git a/lib/debugger/src/Makefile b/lib/debugger/src/Makefile
|
|
|
eeecf7 |
index 1e8f51d..bfdb0c9 100644
|
|
|
eeecf7 |
--- a/lib/debugger/src/Makefile
|
|
|
eeecf7 |
+++ b/lib/debugger/src/Makefile
|
|
|
eeecf7 |
@@ -63,7 +63,7 @@ MODULES= \
|
|
|
eeecf7 |
|
|
|
eeecf7 |
HRL_FILES=
|
|
|
eeecf7 |
|
|
|
eeecf7 |
-INTERNAL_HRL_FILES= dbg_ieval.hrl
|
|
|
eeecf7 |
+INTERNAL_HRL_FILES= dbg_ieval.hrl dbg_wx_filedialog_win.hrl
|
|
|
eeecf7 |
|
|
|
eeecf7 |
ERL_FILES= $(MODULES:%=%.erl)
|
|
|
eeecf7 |
|
|
|
eeecf7 |
diff --git a/lib/eunit/src/Makefile b/lib/eunit/src/Makefile
|
|
|
eeecf7 |
index a5e147d..8483e28 100644
|
|
|
eeecf7 |
--- a/lib/eunit/src/Makefile
|
|
|
eeecf7 |
+++ b/lib/eunit/src/Makefile
|
|
|
eeecf7 |
@@ -46,6 +46,8 @@ SOURCES= \
|
|
|
eeecf7 |
|
|
|
eeecf7 |
INCLUDE_FILES = eunit.hrl
|
|
|
eeecf7 |
|
|
|
eeecf7 |
+INTERNAL_HRL_FILES= eunit_internal.hrl
|
|
|
eeecf7 |
+
|
|
|
eeecf7 |
PARSE_TRANSFORM_BIN = $(PARSE_TRANSFORM:%.erl=$(EBIN)/%.$(EMULATOR))
|
|
|
eeecf7 |
|
|
|
eeecf7 |
TARGET_FILES= $(SOURCES:%.erl=$(EBIN)/%.$(EMULATOR))
|
|
|
eeecf7 |
@@ -117,6 +119,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk
|
|
|
eeecf7 |
release_spec: opt
|
|
|
eeecf7 |
$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
|
|
|
eeecf7 |
$(INSTALL_DATA) $(PARSE_TRANSFORM_BIN) $(OBJECTS) "$(RELSYSDIR)/ebin"
|
|
|
eeecf7 |
+ $(INSTALL_DIR) "$(RELSYSDIR)/src"
|
|
|
eeecf7 |
+ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
|
|
|
eeecf7 |
$(INSTALL_DIR) "$(RELSYSDIR)/include"
|
|
|
eeecf7 |
$(INSTALL_DATA) $(INCLUDE_DELIVERABLES) "$(RELSYSDIR)/include"
|
|
|
eeecf7 |
|
|
|
eeecf7 |
diff --git a/lib/kernel/src/Makefile b/lib/kernel/src/Makefile
|
|
|
eeecf7 |
index dbda2a2..3e1792f 100644
|
|
|
eeecf7 |
--- a/lib/kernel/src/Makefile
|
|
|
eeecf7 |
+++ b/lib/kernel/src/Makefile
|
|
|
eeecf7 |
@@ -122,6 +122,7 @@ HRL_FILES= ../include/file.hrl ../include/inet.hrl ../include/inet_sctp.hrl \
|
|
|
eeecf7 |
../include/net_address.hrl
|
|
|
eeecf7 |
|
|
|
eeecf7 |
INTERNAL_HRL_FILES= application_master.hrl disk_log.hrl \
|
|
|
eeecf7 |
+ erl_epmd.hrl hipe_ext_format.hrl \
|
|
|
eeecf7 |
inet_dns.hrl inet_res.hrl \
|
|
|
eeecf7 |
inet_boot.hrl inet_config.hrl inet_int.hrl \
|
|
|
eeecf7 |
inet_dns_record_adts.hrl
|
|
|
eeecf7 |
diff --git a/lib/percept/src/Makefile b/lib/percept/src/Makefile
|
|
|
eeecf7 |
index e501539..5902da3 100644
|
|
|
eeecf7 |
--- a/lib/percept/src/Makefile
|
|
|
eeecf7 |
+++ b/lib/percept/src/Makefile
|
|
|
eeecf7 |
@@ -50,6 +50,8 @@ MODULES= \
|
|
|
eeecf7 |
|
|
|
eeecf7 |
#HRL_FILES= ../include/
|
|
|
eeecf7 |
|
|
|
eeecf7 |
+INTERNAL_HRL_FILES= egd.hrl percept.hrl
|
|
|
eeecf7 |
+
|
|
|
eeecf7 |
ERL_FILES= $(MODULES:%=%.erl)
|
|
|
eeecf7 |
|
|
|
eeecf7 |
TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR)) $(APP_TARGET) $(APPUP_TARGET)
|
|
|
eeecf7 |
@@ -93,6 +95,8 @@ docs:
|
|
|
eeecf7 |
include $(ERL_TOP)/make/otp_release_targets.mk
|
|
|
eeecf7 |
|
|
|
eeecf7 |
release_spec: opt
|
|
|
eeecf7 |
+ $(INSTALL_DIR) "$(RELSYSDIR)/src"
|
|
|
eeecf7 |
+ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
|
|
|
eeecf7 |
# $(INSTALL_DIR) "$(RELSYSDIR)/include"
|
|
|
eeecf7 |
# $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
|
|
|
eeecf7 |
$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
|
|
|
eeecf7 |
diff --git a/lib/test_server/src/Makefile b/lib/test_server/src/Makefile
|
|
|
eeecf7 |
index bcb1bc3..deb7caf 100644
|
|
|
eeecf7 |
--- a/lib/test_server/src/Makefile
|
|
|
eeecf7 |
+++ b/lib/test_server/src/Makefile
|
|
|
eeecf7 |
@@ -123,7 +123,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
|
|
|
eeecf7 |
|
|
|
eeecf7 |
release_spec: opt
|
|
|
eeecf7 |
$(INSTALL_DIR) "$(RELSYSDIR)/src"
|
|
|
eeecf7 |
- $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
|
|
|
eeecf7 |
+ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(TS_HRL_FILES) "$(RELSYSDIR)/src"
|
|
|
eeecf7 |
$(INSTALL_DIR) "$(RELSYSDIR)/include"
|
|
|
eeecf7 |
$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
|
|
|
eeecf7 |
$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
|