Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b6ab94e authored by Josh Poimboeuf's avatar Josh Poimboeuf Committed by Arnaldo Carvalho de Melo
Browse files

perf subcmd: Create subcmd library 



Move the subcommand-related files from perf to a new library named
libsubcmd.a.

Since we're moving files anyway, go ahead and rename 'exec_cmd.*' to
'exec-cmd.*' to be consistent with the naming of all the other files.

Signed-off-by: default avatarJosh Poimboeuf <jpoimboe@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/c0a838d4c878ab17fee50998811612b2281355c1.1450193761.git.jpoimboe@redhat.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 2f4ce5ec

tools/lib/subcmd/Build

0 → 100644
+7 −0
Original line number Diff line number Diff line 
libsubcmd-y += exec-cmd.o

libsubcmd-y += help.o

libsubcmd-y += pager.o

libsubcmd-y += parse-options.o

libsubcmd-y += run-command.o

libsubcmd-y += sigchain.o

libsubcmd-y += subcmd-config.o

tools/lib/subcmd/Makefile

0 → 100644
+48 −0
Original line number Diff line number Diff line 
include ../../scripts/Makefile.include

include ../../perf/config/utilities.mak		# QUIET_CLEAN



ifeq ($(srctree),)

srctree := $(patsubst %/,%,$(dir $(shell pwd)))

srctree := $(patsubst %/,%,$(dir $(srctree)))

srctree := $(patsubst %/,%,$(dir $(srctree)))

#$(info Determined 'srctree' to be $(srctree))

endif



CC = $(CROSS_COMPILE)gcc

AR = $(CROSS_COMPILE)ar

RM = rm -f



MAKEFLAGS += --no-print-directory



LIBFILE = $(OUTPUT)libsubcmd.a



CFLAGS := $(EXTRA_WARNINGS) $(EXTRA_CFLAGS)

CFLAGS += -ggdb3 -Wall -Wextra -std=gnu99 -Werror -O6 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fPIC

CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE



CFLAGS += -I$(srctree)/tools/include/

CFLAGS += -I$(srctree)/include/uapi

CFLAGS += -I$(srctree)/include



SUBCMD_IN := $(OUTPUT)libsubcmd-in.o



all:



export srctree OUTPUT CC LD CFLAGS V

include $(srctree)/tools/build/Makefile.include



all: fixdep $(LIBFILE)



$(SUBCMD_IN): FORCE

	@$(MAKE) $(build)=libsubcmd



$(LIBFILE): $(SUBCMD_IN)

	$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(SUBCMD_IN)



clean:

	$(call QUIET_CLEAN, libsubcmd) $(RM) $(LIBFILE); \

	find $(if $(OUTPUT),$(OUTPUT),.) -name \*.o -or -name \*.o.cmd -or -name \*.o.d | xargs $(RM)



FORCE:



.PHONY: clean FORCE

tools/perf/util/exec_cmd.c→tools/lib/subcmd/exec-cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
#include <stdlib.h>

#include <stdio.h>

#include "subcmd-util.h"

#include "exec_cmd.h"

#include "exec-cmd.h"

#include "subcmd-config.h"



#define MAX_ARGS	32

tools/perf/util/exec_cmd.h→tools/lib/subcmd/exec-cmd.h

+0 −0

File moved.

View file

tools/perf/util/help.c→tools/lib/subcmd/help.c

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#include <dirent.h>

#include "subcmd-util.h"

#include "help.h"

#include "exec_cmd.h"

#include "exec-cmd.h"



void add_cmdname(struct cmdnames *cmds, const char *name, size_t len)

{