diff options
| author | Aleksander Morgado <aleksander@lanedo.com> | 2011-12-30 19:16:04 +0100 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@lanedo.com> | 2012-03-15 14:14:41 +0100 |
| commit | b18a801df3b0467f0c3c02eb055a7e19f8a879d5 (patch) | |
| tree | 82b49f94d2c3bad9a9acb2529e2a9ded6ab23407 | |
| parent | 5c1d18d15675d43d9b3bb42adf6911e03823ad88 (diff) | |
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.
| -rw-r--r-- | libmm-common/Makefile.am | 7 | ||||
| -rw-r--r-- | libmm-common/mm-common-bearer-properties.c | 4 | ||||
| -rw-r--r-- | libmm-common/mm-common-connect-properties.c | 4 | ||||
| -rw-r--r-- | libmm-common/mm-common-simple-properties.c | 5 |
4 files changed, 14 insertions, 6 deletions
diff --git a/libmm-common/Makefile.am b/libmm-common/Makefile.am index c78c819c..de042d10 100644 --- a/libmm-common/Makefile.am +++ b/libmm-common/Makefile.am @@ -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 \ diff --git a/libmm-common/mm-common-bearer-properties.c b/libmm-common/mm-common-bearer-properties.c index b70bf492..7515c612 100644 --- a/libmm-common/mm-common-bearer-properties.c +++ b/libmm-common/mm-common-bearer-properties.c @@ -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); diff --git a/libmm-common/mm-common-connect-properties.c b/libmm-common/mm-common-connect-properties.c index 4aa5d87c..d779395f 100644 --- a/libmm-common/mm-common-connect-properties.c +++ b/libmm-common/mm-common-connect-properties.c @@ -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); diff --git a/libmm-common/mm-common-simple-properties.c b/libmm-common/mm-common-simple-properties.c index 64150b42..61bfa649 100644 --- a/libmm-common/mm-common-simple-properties.c +++ b/libmm-common/mm-common-simple-properties.c @@ -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); |