Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761087AbbKTU5p (ORCPT ); Fri, 20 Nov 2015 15:57:45 -0500 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:61830 "EHLO mx0b-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761032AbbKTU5m (ORCPT ); Fri, 20 Nov 2015 15:57:42 -0500 From: Josef Bacik To: , , Subject: [PATCH 01/11] trace-cmd: add install_libs target to trace-cmd Date: Fri, 20 Nov 2015 15:57:23 -0500 Message-ID: <1448053053-24188-2-git-send-email-jbacik@fb.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1448053053-24188-1-git-send-email-jbacik@fb.com> References: <1448053053-24188-1-git-send-email-jbacik@fb.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [192.168.52.123] X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2015-11-20_12:,, signatures=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2147 Lines: 64 This allows other commands to link against trace-cmd. Signed-off-by: Josef Bacik --- Makefile | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 73a98d1..6b5bd29 100644 --- a/Makefile +++ b/Makefile @@ -47,7 +47,10 @@ html_install = $(prefix)/share/kernelshark/html html_install_SQ = '$(subst ','\'',$(html_install))' img_install = $(prefix)/share/kernelshark/html/images img_install_SQ = '$(subst ','\'',$(img_install))' -libdir ?= lib +libdir ?= $(prefix)/lib +libdir_SQ = '$(subst ','\'',$(libdir))' +includedir = $(prefix)/include/trace-cmd +includedir_SQ = '$(subst ','\'',$(includedir))' export man_dir man_dir_SQ html_install html_install_SQ INSTALL export img_install img_install_SQ @@ -57,8 +60,8 @@ ifeq ($(prefix),$(HOME)) plugin_dir = $(HOME)/.trace-cmd/plugins python_dir = $(HOME)/.trace-cmd/python else -plugin_dir = $(prefix)/$(libdir)/trace-cmd/plugins -python_dir = $(prefix)/$(libdir)/trace-cmd/python +plugin_dir = $(libdir)/trace-cmd/plugins +python_dir = $(libdir)/trace-cmd/python PLUGIN_DIR = -DPLUGIN_DIR="$(plugin_dir)" PYTHON_DIR = -DPYTHON_DIR="$(python_dir)" PLUGIN_DIR_SQ = '$(subst ','\'',$(PLUGIN_DIR))' @@ -415,6 +418,8 @@ libtracecmd.so: $(TCMD_LIB_OBJS) libtracecmd.a: $(TCMD_LIB_OBJS) $(Q)$(do_build_static_lib) +libs: libtracecmd.so libparsevent.so + trace-util.o: trace_plugin_dir $(PLUGIN_OBJS): %.o : $(src)/%.c @@ -574,6 +579,12 @@ install_gui: install_cmd gui $(Q)$(call do_install,trace-graph,$(bindir_SQ)) $(Q)$(call do_install,kernelshark,$(bindir_SQ)) +install_libs: libs + $(Q)$(call do_install,libtracecmd.so,$(libdir_SQ)) + $(Q)$(call do_install,libparsevent.so,$(libdir_SQ)) + $(Q)$(call do_install,event-parse.h,$(includedir_SQ)) + $(Q)$(call do_install,trace-cmd.h,$(includedir_SQ)) + doc: $(MAKE) -C $(src)/Documentation all -- 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/