Skip to contentSkip to conversation

btrfs-progs: Add uninstall targets to Makefiles.

PATCH Superseded Nils Steinger 1 participant 2 messages Aug 14, 2014

Subsystems (3)
Documentation Kbuild Btrfs file system
lore
Share & tools
lore

Nils Steinger

author
#0 lore raw

PATCH v3 1/1 btrfs-progs: Add uninstall targets to Makefiles.

I finally got around to applying David Sterba's suggestions about a month ago, but when I sent my updated patch to the mailing list, vger.kernel.org accepted and then silently dropped my mail, so I shelved the patch for a while.
My new filesystem df patch just got through, so here's another try for the Makefile patch.

Nils Steinger (1):
btrfs-progs: Add uninstall targets to Makefiles.

 Documentation/Makefile | 4 ++++
 Makefile               | 7 +++++++
 2 files changed, 11 insertions(+)
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH v3 1/1 btrfs-progs: Add uninstall targets to Makefiles.

Signed-off-by Nils Steinger <[email protected]>

---

v2: As Satoru Takeuchi pointed out, I forgot to remove $(libs) in the main Makefile.

v3: David Sterba suggested not to remove the $(bindir) and $(libdir), since those might be needed by other programs, even if the btrfs uninstallation leaves them empty.

 Documentation/Makefile | 4 ++++
 Makefile               | 7 +++++++
 2 files changed, 11 insertions(+)
Documentation/Makefile +4 -0
index 45299bb..5c9780b 100644
@@ -76,6 +76,10 @@ install-man: man
 	$(INSTALL) -m 644 $(GZ_MAN8) $(DESTDIR)$(man8dir)
 	$(LNS) btrfs-check.8.gz $(DESTDIR)$(man8dir)
 
+uninstall:
+	cd $(DESTDIR)$(man8dir); rm -f btrfs-check.8.gz $(GZ_MAN8)
+	rmdir -p --ignore-fail-on-non-empty $(DESTDIR)$(man8dir)
+
 clean:
 	$(RM) *.xml *.xml+ *.8 *.8.gz
Makefile +7 -0
index 76565e8..de5bd9e 100644
@@ -257,6 +257,13 @@ $(INSTALLDIRS):
 	@echo "Making install in $(patsubst install-%,%,$@)"
 	$(Q)$(MAKE) $(MAKEOPTS) -C $(patsubst install-%,%,$@) install
 
+uninstall:
+	$(Q)$(MAKE) $(MAKEOPTS) -C Documentation uninstall
+	cd $(DESTDIR)$(incdir); rm -f $(headers)
+	rmdir -p --ignore-fail-on-non-empty $(DESTDIR)$(incdir)
+	cd $(DESTDIR)$(libdir); rm -f $(lib_links) $(libs)
+	cd $(DESTDIR)$(bindir); rm -f btrfsck fsck.btrfs $(progs)
+
 ifneq ($(MAKECMDGOALS),clean)
 -include $(objects:.o=.o.d) $(cmd-objects:.o=.o.d) $(subst .btrfs,, $(filter-out btrfsck.o.d, $(progs:=.o.d)))
 endif
Signature · 6 lines
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-