linux-trace-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 0/2] libtracefs: Some clean ups
@ 2021-03-30  0:30 Steven Rostedt
  2021-03-30  0:30 ` [PATCH 1/2] libtracefs: Fix dependencies in Documentation Makefile Steven Rostedt
  2021-03-30  0:30 ` [PATCH 2/2] libtracefs: Add .gitignore files Steven Rostedt
  0 siblings, 2 replies; 3+ messages in thread
From: Steven Rostedt @ 2021-03-30  0:30 UTC (permalink / raw)
  To: linux-trace-devel



Steven Rostedt (VMware) (2):
      libtracefs: Fix dependencies in Documentation Makefile
      libtracefs: Add .gitignore files

----
 .gitignore               | 10 ++++++++++
 Documentation/.gitignore |  4 ++++
 Documentation/Makefile   | 24 +++++++++++++++---------
 3 files changed, 29 insertions(+), 9 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 Documentation/.gitignore

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [PATCH 1/2] libtracefs: Fix dependencies in Documentation Makefile
  2021-03-30  0:30 [PATCH 0/2] libtracefs: Some clean ups Steven Rostedt
@ 2021-03-30  0:30 ` Steven Rostedt
  2021-03-30  0:30 ` [PATCH 2/2] libtracefs: Add .gitignore files Steven Rostedt
  1 sibling, 0 replies; 3+ messages in thread
From: Steven Rostedt @ 2021-03-30  0:30 UTC (permalink / raw)
  To: linux-trace-devel

From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>

Modify the Documentation Makefile to only rebuild the man pages when their
source has been modified.

Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
 Documentation/Makefile | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/Documentation/Makefile b/Documentation/Makefile
index badd80e03b65..efe7b09d4e68 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -13,7 +13,7 @@ MAN3_TXT= \
 MAN_TXT = $(MAN3_TXT)
 _MAN_XML=$(patsubst %.txt,%.xml,$(MAN_TXT))
 _MAN_HTML=$(patsubst %.txt,%.html,$(MAN_TXT))
-_DOC_MAN3=$(patsubst %.txt,%.3,$(MAN3_TXT))
+_DOC_MAN3=$(patsubst %.txt,%.m,$(MAN3_TXT))
 
 MAN_XML=$(addprefix $(OUTPUT),$(_MAN_XML))
 MAN_HTML=$(addprefix $(OUTPUT),$(_MAN_HTML))
@@ -145,13 +145,18 @@ ifdef missing_tools
 	$(error "You need to install $(missing_tools) for man pages")
 endif
 
-do-install-man: man
-	$(Q)$(call do_install,$(OUTPUT)*.3,$(man3dir),644);
+install-%.3: $(OUTPUT)%.3
+	$(Q)$(call do_install,$<,$(man3dir),644);
 
-install-man: man do-install-man
+do-install-man: man $(addprefix install-,$(wildcard $(OUTPUT)*.3))
 
-do-install-html: html
-	$(Q)$(call do_install,$(OUTPUT)*.html,$(htmldir),644);
+install-man: man
+	$(Q)$(MAKE) -C . do-install-man
+
+install-%.txt: $(OUTPUT)%.html
+	$(Q)$(call do_install,$<,$(htmldir),644);
+
+do-install-html: html $(addprefix install-,$(wildcard *.txt))
 
 install-html: html do-install-html
 
@@ -172,7 +177,7 @@ endif
 CLEAN_FILES =					\
 	$(MAN_XML) $(addsuffix +,$(MAN_XML))	\
 	$(MAN_HTML) $(addsuffix +,$(MAN_HTML))	\
-	$(DOC_MAN3) *.3
+	$(DOC_MAN3) *.3 *.m
 
 clean:
 	$(Q) $(RM) $(CLEAN_FILES)
@@ -185,9 +190,10 @@ $(OUTPUT)%.3 : $(OUTPUT)%.txt
 	mv $@+ $@
 endif
 
-$(OUTPUT)%.3 : $(OUTPUT)%.xml
+$(OUTPUT)%.m : $(OUTPUT)%.xml
 	$(QUIET_XMLTO)$(RM) $@ && \
-	$(XMLTO) -o $(OUTPUT). -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<
+	$(XMLTO) -o $(OUTPUT). -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<; \
+	touch $@
 
 $(OUTPUT)%.xml : %.txt
 	$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
-- 
2.30.1



^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [PATCH 2/2] libtracefs: Add .gitignore files
  2021-03-30  0:30 [PATCH 0/2] libtracefs: Some clean ups Steven Rostedt
  2021-03-30  0:30 ` [PATCH 1/2] libtracefs: Fix dependencies in Documentation Makefile Steven Rostedt
@ 2021-03-30  0:30 ` Steven Rostedt
  1 sibling, 0 replies; 3+ messages in thread
From: Steven Rostedt @ 2021-03-30  0:30 UTC (permalink / raw)
  To: linux-trace-devel

From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>

Add .gitignore files to remove backup files from vim and emacs, as well as
created files for installing and for documentation.

Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
 .gitignore               | 10 ++++++++++
 Documentation/.gitignore |  4 ++++
 2 files changed, 14 insertions(+)
 create mode 100644 .gitignore
 create mode 100644 Documentation/.gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..d2d39fbda7c2
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,10 @@
+*~
+\#*\#
+.pc
+libtracefs.pc
+TAGS
+tags
+lib/
+patches/
+build_prefix
+build_uninstall
diff --git a/Documentation/.gitignore b/Documentation/.gitignore
new file mode 100644
index 000000000000..747b2584d55b
--- /dev/null
+++ b/Documentation/.gitignore
@@ -0,0 +1,4 @@
+*.3
+*.m
+*.xml
+*.html
-- 
2.30.1



^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-03-30  0:31 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-30  0:30 [PATCH 0/2] libtracefs: Some clean ups Steven Rostedt
2021-03-30  0:30 ` [PATCH 1/2] libtracefs: Fix dependencies in Documentation Makefile Steven Rostedt
2021-03-30  0:30 ` [PATCH 2/2] libtracefs: Add .gitignore files Steven Rostedt

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).