diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-07-08 13:12:24 +0200 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2016-08-11 11:54:18 +0200 |
| commit | 3d30004710d46c3e7aa66773e3c9a2c36ad048e6 (patch) | |
| tree | 9dc39eccce0411f0d1861aeefa9de5912e1daab7 /src/nm-logging.c | |
| parent | d44fa3140bd3be4e3aedc354c64802394898161d (diff) | |
| download | NetworkManager-3d30004710d46c3e7aa66773e3c9a2c36ad048e6.tar.gz | |
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/.
Diffstat (limited to 'src/nm-logging.c')
| -rw-r--r-- | src/nm-logging.c | 5 |
1 files changed, 0 insertions, 5 deletions
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> |