From 87be32b948d0a92641e8b15058ddcb4c716ef035 Mon Sep 17 00:00:00 2001 From: Jonas 'Sortie' Termansen Date: Tue, 22 Apr 2014 15:26:55 +0200 Subject: [PATCH] Remove obsolete uninstall Makefile target from projects. --- bench/Makefile | 7 +------ carray/Makefile | 2 +- ext/Makefile | 7 +------ games/Makefile | 7 +------ mbr/Makefile | 15 +++++---------- mkinitrd/Makefile | 7 +------ regress/Makefile | 2 +- utils/Makefile | 7 +------ 8 files changed, 12 insertions(+), 42 deletions(-) diff --git a/bench/Makefile b/bench/Makefile index d6a30b64..9b5c2209 100644 --- a/bench/Makefile +++ b/bench/Makefile @@ -12,19 +12,14 @@ BINARIES:=\ benchsyscall \ benchctxswitch \ -INSTALLBINARIES:=$(addprefix $(DESTDIR)$(BINDIR)/,$(BINARIES)) - all: $(BINARIES) -.PHONY: all install uninstall clean +.PHONY: all install clean install: all mkdir -p $(DESTDIR)$(BINDIR) install $(BINARIES) $(DESTDIR)$(BINDIR) -uninstall: - rm -f $(INSTALLBINARIES) - %: %.cpp $(CXX) -std=gnu++11 $(CPPFLAGS) $(CXXFLAGS) $< -o $@ diff --git a/carray/Makefile b/carray/Makefile index 9694370b..9cb15040 100644 --- a/carray/Makefile +++ b/carray/Makefile @@ -12,7 +12,7 @@ BINARY:=carray all: $(BINARY) -.PHONY: all install uninstall clean +.PHONY: all install clean install: all mkdir -p $(DESTDIR)$(BINDIR) diff --git a/ext/Makefile b/ext/Makefile index 5ec659d8..cedb15ea 100644 --- a/ext/Makefile +++ b/ext/Makefile @@ -17,19 +17,14 @@ endif BINARIES:=extfs -INSTALLBINARIES:=$(addprefix $(DESTDIR)$(BINDIR)/,$(BINARIES)) - all: $(BINARIES) -.PHONY: all install uninstall clean +.PHONY: all install clean install: all mkdir -p $(DESTDIR)$(BINDIR) install $(BINARIES) $(DESTDIR)$(BINDIR) -uninstall: - rm -f $(DESTDIR)$(INSTALLBINARIES) - extfs: *.cpp *.h $(CXX) -std=gnu++11 $(CPPFLAGS) $(CXXFLAGS) $(wildcard *.cpp) -o $@ $(LIBS) diff --git a/games/Makefile b/games/Makefile index 5a67ce0a..20b8eebf 100644 --- a/games/Makefile +++ b/games/Makefile @@ -14,21 +14,16 @@ conway \ snake \ asteroids \ -INSTALLBINARIES:=$(addprefix $(DESTDIR)$(BINDIR)/,$(BINARIES)) - LIBS:=-ldispd all: $(BINARIES) -.PHONY: all install uninstall clean +.PHONY: all install clean install: all mkdir -p $(DESTDIR)$(BINDIR) install $(BINARIES) $(DESTDIR)$(BINDIR) -uninstall: - rm -f $(INSTALLBINARIES) - %: %.cpp $(CXX) -std=gnu++11 $(CPPFLAGS) $(CXXFLAGS) $< -o $@ $(LIBS) diff --git a/mbr/Makefile b/mbr/Makefile index 8dd29d54..25765f6d 100644 --- a/mbr/Makefile +++ b/mbr/Makefile @@ -8,24 +8,19 @@ CXXFLAGS?=$(OPTLEVEL) CXXFLAGS:=$(CXXFLAGS) -Wall -Wextra -fno-exceptions -fno-rtti -BINARIES:=mbrfs +BINARY:=mbrfs -INSTALLBINARIES:=$(addprefix $(DESTDIR)$(BINDIR)/,$(BINARIES)) +all: $(BINARY) -all: $(BINARIES) - -.PHONY: all install uninstall clean +.PHONY: all install clean install: all mkdir -p $(DESTDIR)$(BINDIR) - install $(BINARIES) $(DESTDIR)$(BINDIR) - -uninstall: - rm -f $(INSTALLBINARIES) + install $(BINARY) $(DESTDIR)$(BINDIR) %: %.cpp $(CXX) -std=gnu++11 $(CPPFLAGS) $(CXXFLAGS) $< -o $@ clean: - rm -f $(BINARIES) *.o + rm -f $(BINARY) *.o diff --git a/mkinitrd/Makefile b/mkinitrd/Makefile index 1e4557d1..4b1ff79b 100644 --- a/mkinitrd/Makefile +++ b/mkinitrd/Makefile @@ -12,11 +12,9 @@ CXXFLAGS:=$(CXXFLAGS) -Wall -Wextra -fno-exceptions -fno-rtti BINARIES=mkinitrd initrdfs -INSTALLBINARIES:=$(addprefix $(DESTDIR)$(BINDIR)/,$(BINARIES)) - all: $(BINARIES) -.PHONY: all install uninstall clean +.PHONY: all install clean %: %.cpp crc32.cpp rules.cpp $(CXX) -std=gnu++11 $(CPPFLAGS) $(CXXFLAGS) $< crc32.cpp rules.cpp -o $@ @@ -28,6 +26,3 @@ install: all mkdir -p $(DESTDIR)$(BINDIR) install $(BINARIES) $(DESTDIR)$(BINDIR) -uninstall: - rm -f $(INSTALLBINARIES) - diff --git a/regress/Makefile b/regress/Makefile index 66b51445..c3c07412 100644 --- a/regress/Makefile +++ b/regress/Makefile @@ -25,7 +25,7 @@ test-signal-raise \ all: $(BINARIES) $(TESTS) -.PHONY: all install uninstall clean +.PHONY: all install clean install: all mkdir -p $(DESTDIR)$(BINDIR) diff --git a/utils/Makefile b/utils/Makefile index 935076b0..1448e551 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -58,20 +58,15 @@ uptime \ wc \ which \ -INSTALLBINARIES:=$(addprefix $(DESTDIR)$(BINDIR)/,$(BINARIES)) - all: $(BINARIES) -.PHONY: all install uninstall clean +.PHONY: all install clean install: all mkdir -p $(DESTDIR)$(BINDIR) install $(BINARIES) $(DESTDIR)$(BINDIR) install install-file $(DESTDIR)$(BINDIR)/install -uninstall: - rm -f $(INSTALLBINARIES) $(DESTDIR)$(BINDIR)/install - %: %.cpp $(CXX) -std=gnu++11 $(CPPFLAGS) $(CXXFLAGS) $< -o $@