Makefile improvements (fix clean target), and build with -fno-rtti

for reduced binary size.

diff --git a/mconfig b/mconfig
index 780aacef0f5d9c6a1a0452633d8e1fa14d6bd976..8cf17f21429afcd74fd53f2604798384f4482e3d 100644 (file)
--- a/mconfig
+++ b/mconfig
@@ -1,14 +1,14 @@
 # LLVM/clang++ with libc++ on Linux
 #CXX=clang++
-#CXXOPTS=-stdlib=libc++ -std=gnu++11 -Os -Wall
+#CXXOPTS=-stdlib=libc++ -std=gnu++11 -Os -Wall -fno-rtti
 #EXTRA_LIBS=-lc++abi
 
 # GCC. Note with GCC 5,5.1,5.2 the new C++11 ABI is buggy.
 CXX=g++
-CXXOPTS=-D_GLIBCXX_USE_CXX11_ABI=0 -std=gnu++11 -Os -Wall
+CXXOPTS=-D_GLIBCXX_USE_CXX11_ABI=0 -std=gnu++11 -Os -Wall -fno-rtti
 EXTRA_LIBS=
 
 # OpenBSD, tested with GCC 4.9.3 and gmake:
 #CXX=eg++
-#CXXOPTS=-D_GLIBCXX_USE_CXX11_ABI=0 -std=gnu++11 -Os -Wall
+#CXXOPTS=-D_GLIBCXX_USE_CXX11_ABI=0 -std=gnu++11 -Os -Wall -fno-rtti
 #EXTRA_LIBS=

diff --git a/src/Makefile b/src/Makefile
index 13da888c1407421a502ee70b7793fcdf11f2e903..25216eac505c5c846493adf6b450526bb33fad73 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -28,5 +28,5 @@ $(objects): %.o: %.cc service.h dinit-log.h control.h control-cmds.h cpbuffer.h
 #install.man:
 
 clean:
-       rm *.o
-       rm dinit
+       rm -f *.o
+       rm -f dinit dinitctl shutdown