Rename load_service.cc to load-service.cc for consistency.

[oweals/dinit.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index a163de031b5635842de6c0a4cfe9030565af97bf..cf7887d29e1b6424203c5e5f6b84a550ad3381ee 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,37 +1,41 @@
--include ../mconfig
+include ../mconfig
 
 ifeq ($(BUILD_SHUTDOWN),yes)
   SHUTDOWN=shutdown
 endif
 
-objects = dinit.o load_service.o service.o control.o dinit-log.o dinitctl.o shutdown.o dinit-reboot.o
+dinit_objects = dinit.o load-service.o service.o proc-service.o baseproc-service.o control.o dinit-log.o \
+               dinit-main.o run-child-proc.o
 
-dinit_objects = dinit.o load_service.o service.o control.o dinit-log.o
+objects = $(dinit_objects) dinitctl.o shutdown.o
 
 all: dinit dinitctl $(SHUTDOWN)
 
 dinit: $(dinit_objects)
-       $(CXX) -o dinit $(dinit_objects) $(EXTRA_LIBS)
+       $(CXX) -o dinit $(dinit_objects) $(LDFLAGS)
 
 dinitctl: dinitctl.o
-       $(CXX) -o dinitctl dinitctl.o $(EXTRA_LIBS)
+       $(CXX) -o dinitctl dinitctl.o $(LDFLAGS)
        
 shutdown: shutdown.o
-       $(CXX) -o shutdown shutdown.o
+       $(CXX) -o shutdown shutdown.o $(LDFLAGS)
 
-dinit-reboot: dinit-reboot.o
-       $(CXX) -o dinit-reboot dinit-reboot.o   
+$(objects): %.o: %.cc
+       $(CXX) $(CXXOPTS) -MMD -MP -Iincludes -Idasynq -c $< -o $@
 
-$(objects): %.o: %.cc service.h dinit-log.h control.h control-cmds.h cpbuffer.h
-       $(CXX) $(CXXOPTS) -Idasynq -c $< -o $@
+check:
+       $(MAKE) -C tests check
 
 install: all
-       install -d $(DESTDIR)/sbin
-       install -s dinit dinitctl $(SHUTDOWN) $(DESTDIR)/sbin
+       install -d $(DESTDIR)$(SBINDIR)
+       install -s dinit dinitctl $(SHUTDOWN) $(DESTDIR)$(SBINDIR)
 ifeq ($(BUILD_SHUTDOWN),yes)
-       install halt reboot $(DESTDIR)/sbin
+       install halt reboot $(DESTDIR)$(SBINDIR)
 endif
 
 clean:
-       rm -f *.o
+       rm -f *.o *.d
        rm -f dinit dinitctl shutdown
+       $(MAKE) -C tests clean
+
+-include $(objects:.o=.d)