Build system and directory structure cleanup

Signed-off-by: David Oberhollenzer <david.oberhollenzer@tele2.at>

Makefile.am

@@ -9,13 +9,13 @@ EXTRA_DIST = README LICENSE
 
 helperdir = @SCRIPTDIR@
 helper_PROGRAMS =
+helper_SCRIPTS =
 
 include lib/Makemodule.am
 include cmd/Makemodule.am
 include initd/Makemodule.am
 include scripts/Makemodule.am
 include services/Makemodule.am
-include servicecmd/Makemodule.am
 
 install-data-local:
 	$(MKDIR_P) $(DESTDIR)$(SVCDIR)

cmd/Makemodule.am

@@ -15,5 +15,18 @@ killall5_CPPFLAGS = $(AM_CPPFLAGS)
 killall5_CFLAGS = $(AM_CFLAGS)
 killall5_LDFLAGS = $(AM_LDFLAGS)
 
-sbin_PROGRAMS += reboot shutdown
+SRVHEADERS = cmd/service/servicecmd.h
+
+service_SOURCES = cmd/service/servicecmd.c cmd/service/help.c
+service_SOURCES += cmd/service/enable.c cmd/service/disable.c
+service_SOURCES += cmd/service/dumpscript.c cmd/service/list.c
+service_SOURCES += $(SRVHEADERS)
+service_CPPFLAGS = $(AM_CPPFLAGS)
+service_CFLAGS = $(AM_CFLAGS)
+service_LDFLAGS = $(AM_LDFLAGS)
+service_LDADD = libinit.a
+
+EXTRA_DIST += $(SRVHEADERS)
+
+sbin_PROGRAMS += service reboot shutdown
 helper_PROGRAMS += killall5

scripts/Makemodule.am

@@ -1,6 +1,5 @@
-scriptdir = @SCRIPTDIR@
+helper_SCRIPTS += scripts/devfs.sh scripts/trymount.sh
-script_SCRIPTS = scripts/devfs.sh scripts/trymount.sh
 
 if PYGOSCFG
-script_SCRIPTS += scripts/overlay.sh
+helper_SCRIPTS += scripts/overlay.sh
 endif

servicecmd/Makemodule.am

@@ -1,13 +0,0 @@
-SRVHEADERS = servicecmd/servicecmd.h
-
-service_SOURCES = servicecmd/servicecmd.c servicecmd/help.c servicecmd/list.c
-service_SOURCES += servicecmd/enable.c servicecmd/disable.c
-service_SOURCES += servicecmd/dumpscript.c $(SRVHEADERS)
-service_CPPFLAGS = $(AM_CPPFLAGS)
-service_CFLAGS = $(AM_CFLAGS)
-service_LDFLAGS = $(AM_LDFLAGS)
-service_LDADD = libinit.a
-
-EXTRA_DIST += $(SRVHEADERS)
-
-sbin_PROGRAMS += service