From: Peter Lemenkov <lemenkov@gmail.com>

Date: Fri, 18 Jun 2010 23:41:33 +0400

Subject: [PATCH] Do not install C sources

Don't install *.c and *.o files.

Excepts ones from the internal erl_interface. These

API headers are necessary. See rhbz #818419 for the

explanation why they're necessary for the low-level

interaction with the Erlang nodes:

https://bugzilla.redhat.com/818419

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>

---

 lib/asn1/c_src/Makefile             |  2 --

 lib/crypto/c_src/Makefile.in        |  4 ----

 lib/erl_interface/src/Makefile.in   | 16 ++++++++--------

 lib/ic/c_src/Makefile.in            |  2 --

 lib/megaco/src/flex/Makefile.in     |  2 +-

 lib/odbc/c_src/Makefile.in          |  3 ---

 lib/os_mon/c_src/Makefile.in        |  2 --

 lib/runtime_tools/c_src/Makefile.in |  2 --

 lib/tools/c_src/Makefile.in         |  2 --

 9 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile

index 7023833..8bf8eb9 100644

--- a/lib/asn1/c_src/Makefile

+++ b/lib/asn1/c_src/Makefile

@@ -107,8 +107,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk

 release_spec: opt

 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/lib"

 	$(INSTALL_PROGRAM) $(NIF_SHARED_OBJ_FILE) "$(RELSYSDIR)/priv/lib"

-	$(INSTALL_DIR) "$(RELSYSDIR)/c_src"

-	$(INSTALL_DATA) *.c "$(RELSYSDIR)/c_src"

 release_docs_spec:

diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in

index e890927..1377654 100644

--- a/lib/crypto/c_src/Makefile.in

+++ b/lib/crypto/c_src/Makefile.in

@@ -160,13 +160,9 @@ docs:

 include $(ERL_TOP)/make/otp_release_targets.mk

 release_spec: opt

-	$(INSTALL_DIR) "$(RELSYSDIR)/priv/obj"

 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/lib"

-	$(INSTALL_DATA) $(NIF_MAKEFILE) "$(RELSYSDIR)/priv/obj"

-	$(INSTALL_PROGRAM) $(CRYPTO_OBJS) "$(RELSYSDIR)/priv/obj"

 	$(INSTALL_PROGRAM) $(NIF_LIB) "$(RELSYSDIR)/priv/lib"

 ifeq ($(DYNAMIC_CRYPTO_LIB),yes)

-	$(INSTALL_PROGRAM) $(CALLBACK_OBJS) "$(RELSYSDIR)/priv/obj"

 	$(INSTALL_PROGRAM) $(CALLBACK_LIB) "$(RELSYSDIR)/priv/lib"

 endif

diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in

index ebacc1c..388e27e 100644

--- a/lib/erl_interface/src/Makefile.in

+++ b/lib/erl_interface/src/Makefile.in

@@ -872,14 +872,14 @@ ifneq ($(EXE_TARGETS),)

 	$(INSTALL_PROGRAM) $(EXE_TARGETS) "$(RELSYSDIR)/bin"

 endif

 	$(INSTALL_DATA) $(EXTRA)        "$(RELSYSDIR)/src"

-	$(INSTALL_DATA) connect/*.[ch]  "$(RELSYSDIR)/src/connect"

-	$(INSTALL_DATA) decode/*.[ch]   "$(RELSYSDIR)/src/decode"

-	$(INSTALL_DATA) encode/*.[ch]   "$(RELSYSDIR)/src/encode"

-	$(INSTALL_DATA) epmd/*.[ch]     "$(RELSYSDIR)/src/epmd"

-	$(INSTALL_DATA) misc/*.[ch]     "$(RELSYSDIR)/src/misc"

-	$(INSTALL_DATA) registry/*.[ch] "$(RELSYSDIR)/src/registry"

-	$(INSTALL_DATA) legacy/*.[ch]   "$(RELSYSDIR)/src/legacy"

-	$(INSTALL_DATA) prog/*.[ch]     "$(RELSYSDIR)/src/prog"

+	$(INSTALL_DATA) connect/*.h  "$(RELSYSDIR)/src/connect"

+	$(INSTALL_DATA) decode/*.h   "$(RELSYSDIR)/src/decode"

+	$(INSTALL_DATA) encode/*.h   "$(RELSYSDIR)/src/encode"

+	$(INSTALL_DATA) epmd/*.h     "$(RELSYSDIR)/src/epmd"

+	$(INSTALL_DATA) misc/*.h     "$(RELSYSDIR)/src/misc"

+	$(INSTALL_DATA) registry/*.h "$(RELSYSDIR)/src/registry"

+	$(INSTALL_DATA) legacy/*.h   "$(RELSYSDIR)/src/legacy"

+	$(INSTALL_DATA) prog/*.h     "$(RELSYSDIR)/src/prog"

 release_docs:

diff --git a/lib/ic/c_src/Makefile.in b/lib/ic/c_src/Makefile.in

index 856823b..d000273 100644

--- a/lib/ic/c_src/Makefile.in

+++ b/lib/ic/c_src/Makefile.in

@@ -146,10 +146,8 @@ $(OBJDIR)/%.o: %.c

 include $(ERL_TOP)/make/otp_release_targets.mk

 release_spec: opt

-	$(INSTALL_DIR) "$(RELSYSDIR)/c_src"

 	$(INSTALL_DIR) "$(RELSYSDIR)/include"

 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/lib"

-	$(INSTALL_DATA) ic.c ic_tmo.c "$(RELSYSDIR)/c_src"

 	$(INSTALL_DATA) $(IDL_FILES) $(H_FILES) "$(RELSYSDIR)/include"

 	$(INSTALL_DATA) $(LIBRARY) "$(RELSYSDIR)/priv/lib"

diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in

index 6111cf2..bd62e8b 100644

--- a/lib/megaco/src/flex/Makefile.in

+++ b/lib/megaco/src/flex/Makefile.in

@@ -270,7 +270,7 @@ release_spec: opt

 	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/flex"

 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"

 ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true)

-	$(INSTALL_DATA) $(FLEX_FILES) $(C_TARGETS) "$(RELSYSDIR)/src/flex"

+	$(INSTALL_DATA) $(FLEX_FILES) "$(RELSYSDIR)/src/flex"

 	$(INSTALL_PROGRAM) $(SOLIBS) "$(RELSYSDIR)/priv/lib"

 endif

diff --git a/lib/odbc/c_src/Makefile.in b/lib/odbc/c_src/Makefile.in

index 6572d28..c7093ae 100644

--- a/lib/odbc/c_src/Makefile.in

+++ b/lib/odbc/c_src/Makefile.in

@@ -128,11 +128,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk

 release_spec: opt

 ifdef EXE_TARGET

-	$(INSTALL_DIR) "$(RELSYSDIR)/c_src"

-	$(INSTALL_DATA) $(C_FILES) $(H_FILES) "$(RELSYSDIR)/c_src"

 	$(INSTALL_DIR) "$(RELSYSDIR)/priv"

 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/bin"

-	$(INSTALL_DIR) "$(RELSYSDIR)/priv/obj"

 	$(INSTALL_PROGRAM) $(EXE_TARGET) "$(RELSYSDIR)/priv/bin"

 endif

diff --git a/lib/os_mon/c_src/Makefile.in b/lib/os_mon/c_src/Makefile.in

index 51569f6..4e4d729 100644

--- a/lib/os_mon/c_src/Makefile.in

+++ b/lib/os_mon/c_src/Makefile.in

@@ -124,8 +124,6 @@ $(OBJDIR)/memsup.o: memsup.h

 include $(ERL_TOP)/make/otp_release_targets.mk

 release_spec: opt

-	$(INSTALL_DIR) "$(RELSYSDIR)/src"

-	$(INSTALL_DATA) $(C_FILES) "$(RELSYSDIR)/src"

 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/bin"

 	$(INSTALL_PROGRAM) $(TARGET_FILES) "$(RELSYSDIR)/priv/bin"

diff --git a/lib/runtime_tools/c_src/Makefile.in b/lib/runtime_tools/c_src/Makefile.in

index d315a90..7b4b9fb 100644

--- a/lib/runtime_tools/c_src/Makefile.in

+++ b/lib/runtime_tools/c_src/Makefile.in

@@ -177,9 +177,7 @@ docs:

 include $(ERL_TOP)/make/otp_release_targets.mk

 release_spec: opt

-	$(INSTALL_DIR) "$(RELSYSDIR)/priv/obj"

 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/lib"

-	$(INSTALL_PROGRAM) $(DYNTRACE_OBJS) "$(RELSYSDIR)/priv/obj"

 	$(INSTALL_PROGRAM) $(NIF_LIB) $(SOLIBS) "$(RELSYSDIR)/priv/lib"

 release_docs_spec:

diff --git a/lib/tools/c_src/Makefile.in b/lib/tools/c_src/Makefile.in

index aea5686..a0c8883 100644

--- a/lib/tools/c_src/Makefile.in

+++ b/lib/tools/c_src/Makefile.in

@@ -189,8 +189,6 @@ include ../vsn.mk

 RELSYSDIR = $(RELEASE_PATH)/lib/tools-$(TOOLS_VSN)

 release_spec: all

-	$(INSTALL_DIR) "$(RELSYSDIR)/c_src"

-	$(INSTALL_DATA) $(EMEM_SRCS) $(EMEM_HEADERS) "$(RELSYSDIR)/c_src"

 ifneq ($(PROGS),)

 	$(INSTALL_DIR) "$(RELSYSDIR)/bin"

 	$(INSTALL_PROGRAM) $(PROGS) "$(RELSYSDIR)/bin"