Follow-up to 8be7a46, simplify linking of tmpfiles program

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>

src/Makefile.am

@@ -44,13 +44,8 @@ sulogin_SOURCES      = sulogin.c
 sulogin_CFLAGS       = -W -Wall -Wextra -std=gnu99
 sulogin_LDADD        = -lcrypt
 
-tmpfiles_SOURCES     = tmpfiles.c helpers.c util.c exec.c log.c    \
-		       svc.c sig.c sm.c api.c mount.c service.c    \
-		       schedule.c cond.c cond-w.c pid.c plugin.c   \
-		       utmp-api.c client.c cgroup.c mdadm.c tty.c  \
-		       iwatch.c conf.c devmon.c logrotate.c stty.c \
-		       runparts.c
-tmpfiles_CFLAGS      = -W -Wall -Wextra -std=gnu99 -D__FINIT__
+tmpfiles_SOURCES     = tmpfiles.c util.c util.h log.h
+tmpfiles_CFLAGS      = -W -Wall -Wextra -std=gnu99
 tmpfiles_CFLAGS     += $(lite_CFLAGS) $(uev_CFLAGS)
 tmpfiles_LDADD       = $(lite_LIBS) $(uev_LIBS)
 

src/tmpfiles.c

@@ -40,31 +40,10 @@
 # include <lite/lite.h>
 #endif
 
-#include "svc.h"
-#include "helpers.h"
 #include "log.h"
 #include "util.h"
 
 int debug;
-int runlevel;
-char *osheading;
-svc_t *wdog;
-uev_ctx_t *ctx;
-int syncsec;
-int rescue;
-char *network;
-int cfglevel;
-char *finit_rcsd;
-char *sdown;
-char *hostname;
-int bootstrap;
-int single;
-int readiness;
-char *finit_conf;
-char *fstab;
-int prevlevel;
-int cmdlevel;
-int kerndebug;
 
 int c_flag = 0;
 int r_flag = 0;
@@ -539,7 +518,7 @@ static void tmpfiles(char *line)
 
 			for (size_t i = 0; i < gl.gl_pathc; i++) {
 				snprintf(buf, sizeof(buf), "restorecon %s %s", opts, gl.gl_pathv[i]);
-				run(buf, "restorecon");
+				system(buf);
 			}
 			break;
 		default: