|
Peter Lemenkov |
96952b |
From: Peter Lemenkov <lemenkov@gmail.com>
|
|
Peter Lemenkov |
96952b |
Date: Fri, 18 Jun 2010 23:41:33 +0400
|
|
Hans Ulrich Niedermann |
696873 |
Subject: [PATCH] Do not install C sources
|
|
Peter Lemenkov |
96952b |
|
|
 |
a6c182 |
Don't install *.c and *.o files.
|
|
|
a6c182 |
|
|
|
a6c182 |
Excepts ones from the internal erl_interface. These
|
|
|
a6c182 |
API headers are necessary. See rhbz #818419 for the
|
|
|
a6c182 |
explanation why they're necessary for the low-level
|
|
|
a6c182 |
interaction with the Erlang nodes:
|
|
|
a6c182 |
|
|
|
a6c182 |
https://bugzilla.redhat.com/818419
|
|
|
5203c4 |
|
|
Peter Lemenkov |
96952b |
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
|
|
Peter Lemenkov |
96952b |
---
|
|
|
61833a |
lib/asn1/c_src/Makefile | 2 --
|
|
|
a6c182 |
lib/crypto/c_src/Makefile.in | 4 ----
|
|
|
a6c182 |
lib/erl_interface/src/Makefile.in | 16 ++++++++--------
|
|
|
61833a |
lib/ic/c_src/Makefile.in | 2 --
|
|
|
61833a |
lib/megaco/src/flex/Makefile.in | 2 +-
|
|
|
61833a |
lib/odbc/c_src/Makefile.in | 3 ---
|
|
|
61833a |
lib/os_mon/c_src/Makefile.in | 2 --
|
|
|
61833a |
lib/runtime_tools/c_src/Makefile.in | 2 --
|
|
|
61833a |
lib/tools/c_src/Makefile.in | 2 --
|
|
|
a6c182 |
9 files changed, 9 insertions(+), 26 deletions(-)
|
|
Peter Lemenkov |
96952b |
|
|
Peter Lemenkov |
96952b |
diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile
|
|
|
a6c182 |
index 7023833..8bf8eb9 100644
|
|
Peter Lemenkov |
96952b |
--- a/lib/asn1/c_src/Makefile
|
|
Peter Lemenkov |
96952b |
+++ b/lib/asn1/c_src/Makefile
|
|
|
a6c182 |
@@ -107,8 +107,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
|
|
Peter Lemenkov |
96952b |
release_spec: opt
|
|
|
61833a |
$(INSTALL_DIR) "$(RELSYSDIR)/priv/lib"
|
|
|
61833a |
$(INSTALL_PROGRAM) $(NIF_SHARED_OBJ_FILE) "$(RELSYSDIR)/priv/lib"
|
|
|
61833a |
- $(INSTALL_DIR) "$(RELSYSDIR)/c_src"
|
|
|
61833a |
- $(INSTALL_DATA) *.c "$(RELSYSDIR)/c_src"
|
|
Peter Lemenkov |
96952b |
|
|
Peter Lemenkov |
96952b |
release_docs_spec:
|
|
Peter Lemenkov |
96952b |
|
|
Peter Lemenkov |
96952b |
diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in
|
|
|
a6c182 |
index e890927..1377654 100644
|
|
Peter Lemenkov |
96952b |
--- a/lib/crypto/c_src/Makefile.in
|
|
Peter Lemenkov |
96952b |
+++ b/lib/crypto/c_src/Makefile.in
|
|
|
a6c182 |
@@ -160,13 +160,9 @@ docs:
|
|
Peter Lemenkov |
96952b |
include $(ERL_TOP)/make/otp_release_targets.mk
|
|
Peter Lemenkov |
96952b |
|
|
Peter Lemenkov |
96952b |
release_spec: opt
|
|
|
61833a |
- $(INSTALL_DIR) "$(RELSYSDIR)/priv/obj"
|
|
|
61833a |
$(INSTALL_DIR) "$(RELSYSDIR)/priv/lib"
|
|
|
61833a |
- $(INSTALL_DATA) $(NIF_MAKEFILE) "$(RELSYSDIR)/priv/obj"
|
|
|
a6c182 |
- $(INSTALL_PROGRAM) $(CRYPTO_OBJS) "$(RELSYSDIR)/priv/obj"
|
|
|
61833a |
$(INSTALL_PROGRAM) $(NIF_LIB) "$(RELSYSDIR)/priv/lib"
|
|
|
a6c182 |
ifeq ($(DYNAMIC_CRYPTO_LIB),yes)
|
|
|
a6c182 |
- $(INSTALL_PROGRAM) $(CALLBACK_OBJS) "$(RELSYSDIR)/priv/obj"
|
|
|
a6c182 |
$(INSTALL_PROGRAM) $(CALLBACK_LIB) "$(RELSYSDIR)/priv/lib"
|
|
|
a6c182 |
endif
|
|
Peter Lemenkov |
96952b |
|
|
Peter Lemenkov |
96952b |
diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in
|
|
|
9a9df5 |
index e36b39c..fd377bb 100644
|
|
Peter Lemenkov |
96952b |
--- a/lib/erl_interface/src/Makefile.in
|
|
Peter Lemenkov |
96952b |
+++ b/lib/erl_interface/src/Makefile.in
|
|
|
9a9df5 |
@@ -876,14 +876,14 @@ ifneq ($(EXE_TARGETS),)
|
|
|
61833a |
$(INSTALL_PROGRAM) $(EXE_TARGETS) "$(RELSYSDIR)/bin"
|
|
Peter Lemenkov |
96952b |
endif
|
|
|
a6c182 |
$(INSTALL_DATA) $(EXTRA) "$(RELSYSDIR)/src"
|
|
|
61833a |
- $(INSTALL_DATA) connect/*.[ch] "$(RELSYSDIR)/src/connect"
|
|
|
61833a |
- $(INSTALL_DATA) decode/*.[ch] "$(RELSYSDIR)/src/decode"
|
|
|
61833a |
- $(INSTALL_DATA) encode/*.[ch] "$(RELSYSDIR)/src/encode"
|
|
|
61833a |
- $(INSTALL_DATA) epmd/*.[ch] "$(RELSYSDIR)/src/epmd"
|
|
|
61833a |
- $(INSTALL_DATA) misc/*.[ch] "$(RELSYSDIR)/src/misc"
|
|
|
61833a |
- $(INSTALL_DATA) registry/*.[ch] "$(RELSYSDIR)/src/registry"
|
|
|
61833a |
- $(INSTALL_DATA) legacy/*.[ch] "$(RELSYSDIR)/src/legacy"
|
|
|
61833a |
- $(INSTALL_DATA) prog/*.[ch] "$(RELSYSDIR)/src/prog"
|
|
|
a6c182 |
+ $(INSTALL_DATA) connect/*.h "$(RELSYSDIR)/src/connect"
|
|
|
a6c182 |
+ $(INSTALL_DATA) decode/*.h "$(RELSYSDIR)/src/decode"
|
|
|
a6c182 |
+ $(INSTALL_DATA) encode/*.h "$(RELSYSDIR)/src/encode"
|
|
|
a6c182 |
+ $(INSTALL_DATA) epmd/*.h "$(RELSYSDIR)/src/epmd"
|
|
|
a6c182 |
+ $(INSTALL_DATA) misc/*.h "$(RELSYSDIR)/src/misc"
|
|
|
a6c182 |
+ $(INSTALL_DATA) registry/*.h "$(RELSYSDIR)/src/registry"
|
|
|
a6c182 |
+ $(INSTALL_DATA) legacy/*.h "$(RELSYSDIR)/src/legacy"
|
|
|
a6c182 |
+ $(INSTALL_DATA) prog/*.h "$(RELSYSDIR)/src/prog"
|
|
Peter Lemenkov |
96952b |
|
|
Peter Lemenkov |
96952b |
release_docs:
|
|
Peter Lemenkov |
96952b |
|
|
Peter Lemenkov |
96952b |
diff --git a/lib/ic/c_src/Makefile.in b/lib/ic/c_src/Makefile.in
|
|
|
9a9df5 |
index 6e65f06..4120029 100644
|
|
Peter Lemenkov |
96952b |
--- a/lib/ic/c_src/Makefile.in
|
|
Peter Lemenkov |
96952b |
+++ b/lib/ic/c_src/Makefile.in
|
|
|
9a9df5 |
@@ -146,12 +146,10 @@ $(OBJDIR)/%.o: %.c
|
|
Peter Lemenkov |
96952b |
include $(ERL_TOP)/make/otp_release_targets.mk
|
|
Peter Lemenkov |
96952b |
|
|
Peter Lemenkov |
96952b |
release_spec: opt
|
|
|
61833a |
- $(INSTALL_DIR) "$(RELSYSDIR)/c_src"
|
|
|
61833a |
$(INSTALL_DIR) "$(RELSYSDIR)/include"
|
|
|
61833a |
$(INSTALL_DIR) "$(RELSYSDIR)/priv/lib"
|
|
|
9a9df5 |
$(INSTALL_DIR) "$(RELEASE_PATH)/usr/include"
|
|
|
9a9df5 |
$(INSTALL_DIR) "$(RELEASE_PATH)/usr/lib"
|
|
|
61833a |
- $(INSTALL_DATA) ic.c ic_tmo.c "$(RELSYSDIR)/c_src"
|
|
|
61833a |
$(INSTALL_DATA) $(IDL_FILES) $(H_FILES) "$(RELSYSDIR)/include"
|
|
|
61833a |
$(INSTALL_DATA) $(LIBRARY) "$(RELSYSDIR)/priv/lib"
|
|
|
9a9df5 |
$(INSTALL_DATA) $(IDL_FILES) $(H_FILES) "$(RELEASE_PATH)/usr/include"
|
|
Peter Lemenkov |
96952b |
diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in
|
|
|
a6c182 |
index 6111cf2..bd62e8b 100644
|
|
Peter Lemenkov |
96952b |
--- a/lib/megaco/src/flex/Makefile.in
|
|
Peter Lemenkov |
96952b |
+++ b/lib/megaco/src/flex/Makefile.in
|
|
|
a6c182 |
@@ -270,7 +270,7 @@ release_spec: opt
|
|
|
61833a |
$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/flex"
|
|
|
61833a |
$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
|
|
Peter Lemenkov |
96952b |
ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true)
|
|
|
61833a |
- $(INSTALL_DATA) $(FLEX_FILES) $(C_TARGETS) "$(RELSYSDIR)/src/flex"
|
|
|
61833a |
+ $(INSTALL_DATA) $(FLEX_FILES) "$(RELSYSDIR)/src/flex"
|
|
|
61833a |
$(INSTALL_PROGRAM) $(SOLIBS) "$(RELSYSDIR)/priv/lib"
|
|
Peter Lemenkov |
96952b |
endif
|
|
Peter Lemenkov |
96952b |
|
|
Peter Lemenkov |
96952b |
diff --git a/lib/odbc/c_src/Makefile.in b/lib/odbc/c_src/Makefile.in
|
|
|
a6c182 |
index 6572d28..c7093ae 100644
|
|
Peter Lemenkov |
96952b |
--- a/lib/odbc/c_src/Makefile.in
|
|
Peter Lemenkov |
96952b |
+++ b/lib/odbc/c_src/Makefile.in
|
|
|
5d2c88 |
@@ -128,11 +128,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk
|
|
Peter Lemenkov |
96952b |
|
|
Peter Lemenkov |
96952b |
release_spec: opt
|
|
Peter Lemenkov |
96952b |
ifdef EXE_TARGET
|
|
|
61833a |
- $(INSTALL_DIR) "$(RELSYSDIR)/c_src"
|
|
|
61833a |
- $(INSTALL_DATA) $(C_FILES) $(H_FILES) "$(RELSYSDIR)/c_src"
|
|
|
61833a |
$(INSTALL_DIR) "$(RELSYSDIR)/priv"
|
|
|
61833a |
$(INSTALL_DIR) "$(RELSYSDIR)/priv/bin"
|
|
|
61833a |
- $(INSTALL_DIR) "$(RELSYSDIR)/priv/obj"
|
|
|
61833a |
$(INSTALL_PROGRAM) $(EXE_TARGET) "$(RELSYSDIR)/priv/bin"
|
|
Peter Lemenkov |
96952b |
endif
|
|
Peter Lemenkov |
96952b |
|
|
Peter Lemenkov |
96952b |
diff --git a/lib/os_mon/c_src/Makefile.in b/lib/os_mon/c_src/Makefile.in
|
|
|
9a9df5 |
index f84ccf7..05d194f 100644
|
|
Peter Lemenkov |
96952b |
--- a/lib/os_mon/c_src/Makefile.in
|
|
Peter Lemenkov |
96952b |
+++ b/lib/os_mon/c_src/Makefile.in
|
|
|
9a9df5 |
@@ -125,8 +125,6 @@ $(OBJDIR)/memsup.o: memsup.h
|
|
|
a6c182 |
include $(ERL_TOP)/make/otp_release_targets.mk
|
|
|
a6c182 |
|
|
Peter Lemenkov |
96952b |
release_spec: opt
|
|
|
61833a |
- $(INSTALL_DIR) "$(RELSYSDIR)/src"
|
|
|
61833a |
- $(INSTALL_DATA) $(C_FILES) "$(RELSYSDIR)/src"
|
|
|
61833a |
$(INSTALL_DIR) "$(RELSYSDIR)/priv/bin"
|
|
|
61833a |
$(INSTALL_PROGRAM) $(TARGET_FILES) "$(RELSYSDIR)/priv/bin"
|
|
|
a6c182 |
|
|
|
5203c4 |
diff --git a/lib/runtime_tools/c_src/Makefile.in b/lib/runtime_tools/c_src/Makefile.in
|
|
|
a6c182 |
index d315a90..7b4b9fb 100644
|
|
|
5203c4 |
--- a/lib/runtime_tools/c_src/Makefile.in
|
|
|
5203c4 |
+++ b/lib/runtime_tools/c_src/Makefile.in
|
|
|
a6c182 |
@@ -177,9 +177,7 @@ docs:
|
|
|
5203c4 |
include $(ERL_TOP)/make/otp_release_targets.mk
|
|
|
5203c4 |
|
|
|
5203c4 |
release_spec: opt
|
|
|
61833a |
- $(INSTALL_DIR) "$(RELSYSDIR)/priv/obj"
|
|
|
61833a |
$(INSTALL_DIR) "$(RELSYSDIR)/priv/lib"
|
|
|
61833a |
- $(INSTALL_PROGRAM) $(DYNTRACE_OBJS) "$(RELSYSDIR)/priv/obj"
|
|
|
61833a |
$(INSTALL_PROGRAM) $(NIF_LIB) $(SOLIBS) "$(RELSYSDIR)/priv/lib"
|
|
|
5203c4 |
|
|
|
5203c4 |
release_docs_spec:
|
|
Peter Lemenkov |
96952b |
diff --git a/lib/tools/c_src/Makefile.in b/lib/tools/c_src/Makefile.in
|
|
|
a6c182 |
index aea5686..a0c8883 100644
|
|
Peter Lemenkov |
96952b |
--- a/lib/tools/c_src/Makefile.in
|
|
Peter Lemenkov |
96952b |
+++ b/lib/tools/c_src/Makefile.in
|
|
|
a6c182 |
@@ -189,8 +189,6 @@ include ../vsn.mk
|
|
Peter Lemenkov |
96952b |
RELSYSDIR = $(RELEASE_PATH)/lib/tools-$(TOOLS_VSN)
|
|
Peter Lemenkov |
96952b |
|
|
Peter Lemenkov |
96952b |
release_spec: all
|
|
|
61833a |
- $(INSTALL_DIR) "$(RELSYSDIR)/c_src"
|
|
|
61833a |
- $(INSTALL_DATA) $(EMEM_SRCS) $(EMEM_HEADERS) "$(RELSYSDIR)/c_src"
|
|
Peter Lemenkov |
96952b |
ifneq ($(PROGS),)
|
|
|
61833a |
$(INSTALL_DIR) "$(RELSYSDIR)/bin"
|
|
|
61833a |
$(INSTALL_PROGRAM) $(PROGS) "$(RELSYSDIR)/bin"
|