Fix mistakes in cptest asserts

[oweals/dinit.git] / Makefile

diff --git a/Makefile b/Makefile
index d77bbfb43c4830a6956fb85ab760666942b6db3f..9cd695d75ac857d155f48b295a278ad9f500a917 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,32 +1,26 @@
--include mconfig
+# Makefile for Dinit.
 
-objects = dinit.o load_service.o service.o dinit-start.o
+all:
+       $(MAKE) -C src all
+       $(MAKE) -C doc/manpages all
+       @echo "***"
+       @echo "*** Build complete; use \"make check\" to run unit tests, \"make check-igr\" for"
+       @echo "*** integration tests, or \"make install\" to install."
+       @echo "***"
 
-dinit_objects = dinit.o load_service.o service.o
+check:
+       $(MAKE) -C src check
 
-all: dinit dinit-start
+check-igr:
+       $(MAKE) -C src check-igr
 
-dinit: $(dinit_objects)
-       g++ -Wall -o dinit $(dinit_objects) -lev
+run-cppcheck:
+       $(MAKE) -C src run-cppcheck
 
-dinit-start: dinit-start.o
-       g++ -Wall -o dinit-start dinit-start.o
-
-# Note we use the old ABI on GCC 5.2 to avoid GCC bug 66145.
-$(objects): %.o: %.cc service.h
-       g++ -D_GLIBCXX_USE_CXX11_ABI=0 -std=gnu++11 -c -Os -Wall $< -o $@
-
-install: all
-       #install -d $(LOGINBINDIR) $(LOGINDOCDIR)
-       #install -s login $(LOGINBINDIR)
-       #install --mode=644 README $(LOGINDOCDIR)
-       #@echo
-       #@echo "You may also wish to \"make install.man\"."
-
-install.man:
-       #install -d $(MAN1DIR)
-       #install --mode=644 login.1 $(MAN1DIR)
+install:
+       $(MAKE) -C src install
+       $(MAKE) -C doc/manpages install
 
 clean:
-       rm *.o
-       rm dinit
+       $(MAKE) -C src clean
+       $(MAKE) -C doc/manpages clean