From 1546111ae258101825045a7ca656078349b73e7c Mon Sep 17 00:00:00 2001

From: Peter Lemenkov <lemenkov@gmail.com>

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

Subject: [PATCH 04/12] Do not install C sources

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

---

 lib/asn1/c_src/Makefile           |    2 --

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

 lib/erl_interface/src/Makefile.in |   18 ------------------

 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      |    1 -

 lib/ssl/c_src/Makefile.in         |    9 ---------

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

 9 files changed, 1 insertions(+), 41 deletions(-)

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

index 9e9cb18..1d73d3c 100644

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

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

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

 release_spec: opt

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

 	$(INSTALL_PROGRAM) $(SHARED_OBJ_FILES) $(RELSYSDIR)/priv/lib

-	$(INSTALL_DIR) $(RELSYSDIR)/c_src

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

 release_docs_spec:

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

index 48f931d..4a7a183 100644

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

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

@@ -136,10 +136,7 @@ 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) $(OBJS) $(RELSYSDIR)/priv/obj

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

 release_docs_spec:

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

index 8ff142a..d785902 100644

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

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

@@ -876,29 +876,11 @@ release: opt

 	$(INSTALL_DIR) $(RELSYSDIR)/include

 	$(INSTALL_DIR) $(RELSYSDIR)/lib

 	$(INSTALL_DIR) $(RELSYSDIR)/bin

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

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

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

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

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

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

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

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

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

 	$(INSTALL_DATA) $(HEADERS)     $(RELSYSDIR)/include

 	$(INSTALL_DATA) $(OBJ_TARGETS) $(RELSYSDIR)/lib

 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

 release_docs:

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

index 6eef782..091895b 100644

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

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

@@ -144,10 +144,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 5af651d..2ccf2a9 100644

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

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

@@ -279,7 +279,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 ed3eeb1..c01d9bf 100644

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

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

@@ -131,11 +131,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 1a371eb..62eac66 100644

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

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

@@ -136,7 +136,6 @@ release_spec:

 else

 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

 endif

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

index 5e6c74e..bf4843b 100644

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

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

@@ -199,15 +199,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk

 release_spec: opt

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

 	$(INSTALL_PROGRAM) $(PORT_PROGRAM) $(RELSYSDIR)/priv/bin

-ifneq ($(SSL_MAKEFILE),)

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

-	$(INSTALL_DATA) $(OBJS) $(RELSYSDIR)/priv/obj

-	sed 	-e "s;%BINDIR%;../bin;" \

-		-e "s;%SSL_LIBDIR%;$(SSL_LIBDIR);" \

-		-e "s;%OBJS;$(OBJS);" \

-		-e "s;%LIBS%;$(LIBS);" ./Makefile.dist \

-		> $(RELSYSDIR)/priv/obj/Makefile

-endif

 release_docs_spec:

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

index 65a7f5f..144c1ba 100644

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

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

@@ -190,8 +190,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

-- 

1.7.3.5