Skip to content

Commit 844aa96

Browse files
committed
remove the "uninstall" target from the Makefile
The "uninstall" target is dangerous as it tries to remove more than what the "install" installs. Also removes the relevant CI workflow step and reference in the README.
1 parent b1a5332 commit 844aa96

File tree

3 files changed

+2
-35
lines changed

3 files changed

+2
-35
lines changed

.github/workflows/run_test_suite.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -111,13 +111,6 @@ jobs:
111111
make install PREFIX=/usr CFG_DIR=/etc DESTDIR="${PWD}/ROOT"
112112
find ROOT/ | sort | xargs -r ls -ld
113113
114-
- name: make uninstall
115-
run: |-
116-
set -x -o pipefail
117-
make uninstall PREFIX=/usr CFG_DIR=/etc DESTDIR="${PWD}/ROOT"
118-
find ROOT/ | sort | xargs -r ls -ld
119-
diff -u0 <(echo 'total 0') <(ls -l ROOT/) # i.e. fail CI if leftovers
120-
121114
- name: make check
122115
run: |-
123116
set -x -o pipefail

Makefile

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#
44
# Make targets:
55
# - install: install LCOV tools and man pages on the system
6-
# - uninstall: remove tools and man pages from the system
76
# - dist: create files required for distribution, i.e. the lcov.tar.gz
87
# and the lcov.rpm file. Just make sure to adjust the VERSION
98
# and RELEASE variables below - both version and date strings
@@ -93,14 +92,13 @@ else
9392
.SILENT:
9493
endif
9594

96-
.PHONY: all info clean install uninstall rpms test
95+
.PHONY: all info clean install rpms test
9796

9897
all: info
9998

10099
info:
101100
@echo "Available make targets:"
102101
@echo " install : install binaries and man pages in DESTDIR (default /)"
103-
@echo " uninstall : delete binaries and man pages from DESTDIR (default /)"
104102
@echo " dist : create packages (RPM, tarball) ready for distribution"
105103
@echo " check : perform self-tests"
106104
@echo " checkstyle: check source files for coding style issues"
@@ -169,30 +167,6 @@ install:
169167
$(INSTALL) -m 644 lcovrc $(CFG_INST_DIR)/lcovrc
170168
$(call echocmd," done INSTALL")
171169

172-
173-
uninstall:
174-
for b in $(EXES) ; do \
175-
$(call echocmd," UNINST $(BIN_INST_DIR)/$$b") \
176-
$(RM) -f $(BIN_INST_DIR)/$$b ; \
177-
done
178-
rmdir --ignore-fail-on-non-empty $(BIN_INST_DIR) || true
179-
for s in $(SCRIPTS) ; do \
180-
$(call echocmd," UNINST $(SCRIPT_INST_DIR)/$$s") \
181-
$(RM) -f $(SCRIPT_INST_DIR)/$$s ; \
182-
done
183-
rmdir --ignore-fail-on-non-empty $(SCRIPT_INST_DIR)
184-
for l in $(LIBS) ; do \
185-
$(call echocmd," UNINST $(LIB_INST_DIR)/$$l") \
186-
$(RM) -f $(LIB_INST_DIR)/$$l ; \
187-
done
188-
rmdir --ignore-fail-on-non-empty $(LIB_INST_DIR) || true
189-
rmdir `dirname $(LIB_INST_DIR)` || true
190-
rm -rf `dirname $(SHARE_INST_DIR)`
191-
$(call echocmd," UNINST $(CFG_INST_DIR)/lcovrc")
192-
$(RM) -f $(CFG_INST_DIR)/lcovrc
193-
rmdir --ignore-fail-on-non-empty $(CFG_INST_DIR) || true
194-
rmdir --ignore-fail-on-non-empty $(DESTDIR)$(PREFIX) || true
195-
196170
dist: lcov-$(VERSION).tar.gz lcov-$(VERSION)-$(RELEASE).noarch.rpm \
197171
lcov-$(VERSION)-$(RELEASE).src.rpm
198172

README

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ Further README contents
7373
man - Directory containing man pages for included tools
7474
example - Directory containing an example to demonstrate LCOV
7575
tests - Directory containing lcov regression tests
76-
Makefile - Makefile providing 'install' and 'uninstall' targets
76+
Makefile - Makefile providing 'install', 'check' and other targets
7777

7878

7979
2. Installing LCOV

0 commit comments

Comments
 (0)