libmm-common: fix build dependencies
Added proper rules in the Makefile so that those files which need the glib-mkenums generated files are built always once the prerequisites are all ready. Also, avoid including libmm-common.h from within source files of the library.
This commit is contained in:
@@ -146,6 +146,13 @@ $(mm_gdbus_bearer_generated): $(top_srcdir)/new/org.freedesktop.ModemManager1.Be
|
||||
$< \
|
||||
$(NULL)
|
||||
|
||||
# Additional dependency rules
|
||||
mm-common-helpers.c: mm-errors-types.h mm-enums-types.h
|
||||
mm-common-simple-properties.c: mm-errors-types.h mm-enums-types.h
|
||||
mm-common-connect-properties.c: mm-errors-types.h
|
||||
mm-common-bearer-properties.c: mm-errors-types.h
|
||||
mm-errors-quarks.c: mm-errors-types.h
|
||||
|
||||
includedir = @includedir@/libmm-common
|
||||
include_HEADERS = \
|
||||
mm-errors-types.h \
|
||||
|
||||
@@ -15,8 +15,8 @@
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#include <libmm-common.h>
|
||||
|
||||
#include "mm-errors-types.h"
|
||||
#include "mm-common-helpers.h"
|
||||
#include "mm-common-bearer-properties.h"
|
||||
|
||||
G_DEFINE_TYPE (MMCommonBearerProperties, mm_common_bearer_properties, G_TYPE_OBJECT);
|
||||
|
||||
@@ -15,8 +15,8 @@
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#include <libmm-common.h>
|
||||
|
||||
#include "mm-errors-types.h"
|
||||
#include "mm-common-helpers.h"
|
||||
#include "mm-common-connect-properties.h"
|
||||
|
||||
G_DEFINE_TYPE (MMCommonConnectProperties, mm_common_connect_properties, G_TYPE_OBJECT);
|
||||
|
||||
@@ -15,8 +15,9 @@
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#include <libmm-common.h>
|
||||
|
||||
#include "mm-enums-types.h"
|
||||
#include "mm-errors-types.h"
|
||||
#include "mm-common-helpers.h"
|
||||
#include "mm-common-simple-properties.h"
|
||||
|
||||
G_DEFINE_TYPE (MMCommonSimpleProperties, mm_common_simple_properties, G_TYPE_OBJECT);
|
||||
|
||||
Reference in New Issue
Block a user