[systemd-commits] 3 commits - hostname-setup.c Makefile.am

[Lennart Poettering]

 Makefile.am      |   60 ++++++++++++-------------------------------------------
 hostname-setup.c |    2 -
 2 files changed, 15 insertions(+), 47 deletions(-)

New commits:
commit 462b33e96ad1732658b39895eea0b146e98bc3a5
Author: Tollef Fog Heen <tfheen at err.no>
Date:   Mon May 10 01:17:49 2010 +0200

    Distribute the necessary header files too
    
    Add all header files that we need to EXTRA_DIST to ensure they are
    actually in the tarball.

diff --git a/Makefile.am b/Makefile.am
index 7396ddd..f475e98 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -131,6 +131,16 @@ COMMON_SOURCES = \
 	fdset.c \
 	namespace.c
 
+EXTRA_DIST += \
+	${COMMON_SOURCES:.c=.h} \
+	macro.h \
+	ioprio.h \
+	missing.h \
+	list.h \
+	securebits.h \
+	linux/auto_dev-ioctl.h \
+	initreq.h
+
 systemd_SOURCES = \
 	$(COMMON_SOURCES) \
 	main.c
commit 75db651adba49238a02fe031842155d30e7a8219
Author: Tollef Fog Heen <tfheen at err.no>
Date:   Mon May 10 01:01:06 2010 +0200

    Remove .h files from _SOURCES
    
    Automake is buggy when you mix C and Vala programs.  It tries to call
    valac with the full contents of _SOURCES for the program, but valac
    errors out when given .h files.  Until this is fixed, we can't list .h
    files in _SOURCES or "make dist" breaks.

diff --git a/Makefile.am b/Makefile.am
index 115cd05..7396ddd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -78,99 +78,57 @@ EXTRA_DIST = \
 	units/systemd-logger.service.in \
 	units/systemd-logger.socket
 
+# This is needed because automake is buggy in how it generates the
+# rules for C programs, but not Vala programs.  We therefore can't
+# list the .h files as dependencies if we want make dist to work.
 BASIC_SOURCES = \
         util.c \
-        util.h \
         hashmap.c \
-        hashmap.h \
         set.c \
-        set.h \
         strv.c \
-        strv.h \
         conf-parser.c \
-        conf-parser.h \
         socket-util.c \
-        socket-util.h \
         log.c \
-        log.h \
-        ratelimit.c \
-        ratelimit.h
+        ratelimit.c
 
 COMMON_SOURCES = \
 	$(BASIC_SOURCES) \
 	unit.c \
-	unit.h \
         job.c \
-	job.h \
         manager.c \
-        manager.h \
         load-fragment.c \
-        load-fragment.h \
         service.c \
-        service.h \
         automount.c \
-        automount.h \
         mount.c \
-        mount.h \
         swap.c \
-        swap.h \
         device.c \
-        device.h \
         target.c \
-        target.h \
         snapshot.c \
-        snapshot.h \
         socket.c \
-        socket.h \
         timer.c \
-        timer.h \
         load-dropin.c \
-        load-dropin.h \
         execute.c \
-        execute.h \
         dbus.c \
-        dbus.h \
         dbus-manager.c \
-        dbus-manager.h \
         dbus-unit.c \
-        dbus-unit.h \
         dbus-job.c \
-        dbus-job.h \
 	dbus-service.c \
-	dbus-service.h \
 	dbus-socket.c \
-	dbus-socket.h \
 	dbus-target.c \
-	dbus-target.h \
 	dbus-mount.c \
-	dbus-mount.h \
 	dbus-automount.c \
-	dbus-autpmount.h \
 	dbus-swap.c \
-	dbus-swap.h \
 	dbus-snapshot.c \
-	dbus-snapshot.h \
 	dbus-device.c \
-	dbus-device.h \
 	dbus-execute.c \
-	dbus-execute.h \
 	cgroup.c \
-	cgroup.h \
 	mount-setup.c \
-	mount-setup.h \
 	hostname-setup.c \
-	hostname-setup.h \
 	loopback-setup.c \
-	loopback-setup.h \
 	utmp-wtmp.c \
-	utmp-wtmp.h \
 	specifier.c \
-	specifier.h \
 	unit-name.c \
-	unit-name.h \
 	fdset.c \
-	fdset.h \
-	namespace.h \
 	namespace.c
 
 systemd_SOURCES = \
commit aa4112670b37f2ca1cd64a63337575d45e0d7f36
Author: Tollef Fog Heen <tfheen at err.no>
Date:   Mon May 10 00:32:20 2010 +0200

    Fix compilation issue; s/-NOENT/-ENOENT/

diff --git a/hostname-setup.c b/hostname-setup.c
index 9f61474..71a3f75 100644
--- a/hostname-setup.c
+++ b/hostname-setup.c
@@ -130,7 +130,7 @@ finish:
 
         if (k[0] == 0) {
                 free(k);
-                return -NOENT;
+                return -ENOENT;
         }
 
         *hn = k;