Commit 3d300047 authored by Thomas Haller's avatar Thomas Haller Committed by Beniamino Galvani

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/.
parent d44fa314
......@@ -28,8 +28,8 @@ libexec_PROGRAMS = \
nm_dispatcher_SOURCES = \
$(top_srcdir)/shared/nm-dispatcher-api.h \
nm-dispatcher.c \
nm-dispatcher-api.h \
nm-dispatcher-utils.c \
nm-dispatcher-utils.h
......
......@@ -12,6 +12,7 @@ EXTRA_DIST = \
nm-common-macros.h \
nm-dbus-compat.h \
nm-default.h \
nm-dispatcher-api.h \
nm-test-libnm-utils.h \
nm-test-utils-impl.c \
nm-version-macros.h.in \
......
......@@ -123,9 +123,10 @@ _nm_g_return_if_fail_warning (const char *log_domain,
/*****************************************************************************/
#include "nm-utils/nm-macros-internal.h"
#include "nm-version.h"
#include "nm-utils/nm-shared-utils.h"
#include "nm-version.h"
/*****************************************************************************/
#if ((NETWORKMANAGER_COMPILATION) == NM_NETWORKMANAGER_COMPILATION_LIB) || ((NETWORKMANAGER_COMPILATION) == NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY)
......
This diff is collapsed.
......@@ -22,8 +22,6 @@
#include <nm-setting-ip4-config.h>
#include <nm-setting-ip6-config.h>
#include "nm-default.h"
char *nm_dhcp_dhclient_create_config (const char *interface,
gboolean is_ip6,
GBytes *client_id,
......
......@@ -21,10 +21,6 @@
#ifndef NM_EXPORTED_OBJECT_H
#define NM_EXPORTED_OBJECT_H
#include "nm-default.h"
G_BEGIN_DECLS
/*****************************************************************************/
char *nm_exported_object_skeletonify_method_name (const char *dbus_method_name);
......@@ -79,6 +75,4 @@ GDBusInterfaceSkeleton *nm_exported_object_get_interface_by_type (NMExportedObje
void _nm_exported_object_clear_and_unexport (NMExportedObject **location);
#define nm_exported_object_clear_and_unexport(location) _nm_exported_object_clear_and_unexport ((NMExportedObject **) (location))
G_END_DECLS
#endif /* NM_EXPORTED_OBJECT_H */
#endif /* NM_EXPORTED_OBJECT_H */
......@@ -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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment