From 3d30004710d46c3e7aa66773e3c9a2c36ad048e6 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Fri, 8 Jul 2016 13:12:24 +0200
Subject: build: cleanup src/Makefile.am

- reorder entries in src/Makefile.am so that general names
  are all at the beginning (AM_CPPFLAGS, sbin_PROGRAMS)
  and the names for a certain library/binary are grouped
  together
- have libNetworkManager.la reuse libNetworkManagerBase.la.
- let all components in src/Makefile.am use the same AM_CPPFLAGS,
  except libsystem-nm.la.
- move callouts/nm-dispatcher-api.h to shared/ directory. It
  is obviously not internal API to callouts, and callouts is
  not a library. Thus, the right place is shared/.
---
 src/nm-logging.c | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'src/nm-logging.c')

diff --git a/src/nm-logging.c b/src/nm-logging.c
index d3b4715b2b..8e5a44b603 100644
--- a/src/nm-logging.c
+++ b/src/nm-logging.c
@@ -32,11 +32,6 @@
 #include <strings.h>
 #include <string.h>
 
-#if defined (NO_SYSTEMD_JOURNAL) && defined (SYSTEMD_JOURNAL)
-#undef SYSTEMD_JOURNAL
-#define SYSTEMD_JOURNAL 0
-#endif
-
 #if SYSTEMD_JOURNAL
 #define SD_JOURNAL_SUPPRESS_LOCATION
 #include <systemd/sd-journal.h>
-- 
cgit v1.2.1