|
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 |
|
|
Peter Lemenkov |
96952b |
diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile
|
|
|
c07d3a |
index cb606fd74e..48a7c2f4f1 100644
|
|
Peter Lemenkov |
96952b |
--- a/lib/asn1/c_src/Makefile
|
|
Peter Lemenkov |
96952b |
+++ b/lib/asn1/c_src/Makefile
|
|
|
8a7b81 |
@@ -136,8 +136,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
|
|
|
8a7b81 |
release_spec: opt
|
|
|
8a7b81 |
$(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/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in
|
|
|
e401b7 |
index 56fdaa608e..25764ce50d 100644
|
|
Peter Lemenkov |
96952b |
--- a/lib/erl_interface/src/Makefile.in
|
|
Peter Lemenkov |
96952b |
+++ b/lib/erl_interface/src/Makefile.in
|
|
|
e401b7 |
@@ -690,13 +690,11 @@ release: opt
|
|
|
4a788b |
$(INSTALL_DATA) $(OBJ_TARGETS) "$(RELEASE_PATH)/usr/lib"
|
|
|
61833a |
$(INSTALL_PROGRAM) $(EXE_TARGETS) "$(RELSYSDIR)/bin"
|
|
|
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"
|
|
|
68c6fc |
- $(INSTALL_DATA) global/*.[ch] "$(RELSYSDIR)/src/global"
|
|
|
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"
|
|
Peter Lemenkov |
96952b |
|
|
Peter Lemenkov |
96952b |
release_docs:
|
|
Peter Lemenkov |
96952b |
|
|
Peter Lemenkov |
96952b |
diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in
|
|
|
a27b5d |
index cd409fa54f..c65e817385 100644
|
|
Peter Lemenkov |
96952b |
--- a/lib/megaco/src/flex/Makefile.in
|
|
Peter Lemenkov |
96952b |
+++ b/lib/megaco/src/flex/Makefile.in
|
|
|
4c0d16 |
@@ -251,7 +251,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
|
|
|
68c6fc |
index 3c16e7e294..82fe1492ef 100644
|
|
Peter Lemenkov |
96952b |
--- a/lib/odbc/c_src/Makefile.in
|
|
Peter Lemenkov |
96952b |
+++ b/lib/odbc/c_src/Makefile.in
|
|
|
844843 |
@@ -129,11 +129,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
|
|
|
57b0bc |
index 27b156a2c9..f11ff303b6 100644
|
|
Peter Lemenkov |
96952b |
--- a/lib/os_mon/c_src/Makefile.in
|
|
Peter Lemenkov |
96952b |
+++ b/lib/os_mon/c_src/Makefile.in
|
|
|
844843 |
@@ -126,8 +126,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 |
|
|
Peter Lemenkov |
96952b |
diff --git a/lib/tools/c_src/Makefile.in b/lib/tools/c_src/Makefile.in
|
|
|
d8da3b |
index 878aa2cde6..0153885e88 100644
|
|
Peter Lemenkov |
96952b |
--- a/lib/tools/c_src/Makefile.in
|
|
Peter Lemenkov |
96952b |
+++ b/lib/tools/c_src/Makefile.in
|
|
|
d8da3b |
@@ -170,8 +170,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"
|