diff options
| author | Aleksander Morgado <aleksander@lanedo.com> | 2012-02-28 00:59:50 +0100 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@lanedo.com> | 2012-03-16 14:53:17 +0100 |
| commit | 0c6dad40a0926795cf33da5a4f557302a50a8639 (patch) | |
| tree | 58f863e800facbb2eebf24a87a74596b332fcd1a | |
| parent | 3e511f90c70f7eae68c3452998dbf28c8b1ec764 (diff) | |
build: get path of `glib-mkenums' from pkg-config
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | libmm-common/Makefile.am | 8 | ||||
| -rw-r--r-- | src/Makefile.am | 8 |
3 files changed, 11 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 1f65ae27..47427f18 100644 --- a/configure.ac +++ b/configure.ac @@ -111,6 +111,9 @@ AC_SUBST(UDEV_BASE_DIR) GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0` AC_SUBST(GLIB_GENMARSHAL) +GLIB_MKENUMS=`pkg-config --variable=glib_mkenums glib-2.0` +AC_SUBST(GLIB_MKENUMS) + # PolicyKit AC_ARG_WITH(polkit, AS_HELP_STRING([--with-polkit], [Build with PolicyKit support])) AM_CONDITIONAL(WITH_POLKIT, test "x$with_polkit" = "xyes") diff --git a/libmm-common/Makefile.am b/libmm-common/Makefile.am index f61172d1..2743a9e1 100644 --- a/libmm-common/Makefile.am +++ b/libmm-common/Makefile.am @@ -37,28 +37,28 @@ GENERATED_DOC = \ # Enum types mm-enums-types.h: Makefile.am $(top_srcdir)/include/ModemManager-enums.h $(top_srcdir)/build-aux/mm-enums-template.h - $(AM_V_GEN) glib-mkenums \ + $(AM_V_GEN) $(GLIB_MKENUMS) \ --fhead "#include <ModemManager-enums.h>\n#ifndef __MM_ENUMS_TYPES_H__\n#define __MM_ENUMS_TYPES_H__\n" \ --template $(top_srcdir)/build-aux/mm-enums-template.h \ --ftail "#endif /* __MM_ENUMS_TYPES_H__ */\n" \ $(top_srcdir)/include/ModemManager-enums.h > $@ mm-enums-types.c: Makefile.am $(top_srcdir)/include/ModemManager-enums.h $(top_srcdir)/build-aux/mm-enums-template.c mm-enums-types.h - $(AM_V_GEN) glib-mkenums \ + $(AM_V_GEN) $(GLIB_MKENUMS) \ --fhead "#include \"mm-enums-types.h\"\n" \ --template $(top_srcdir)/build-aux/mm-enums-template.c \ $(top_srcdir)/include/ModemManager-enums.h > $@ # Error types mm-errors-types.h: Makefile.am $(top_srcdir)/include/ModemManager-errors.h $(top_srcdir)/build-aux/mm-errors-template.h - $(AM_V_GEN) glib-mkenums \ + $(AM_V_GEN) $(GLIB_MKENUMS) \ --fhead "#ifndef __MM_ERRORS_TYPES_H__\n#define __MM_ERRORS_TYPES_H__\n" \ --template $(top_srcdir)/build-aux/mm-errors-template.h \ --ftail "#endif /* __MM_ERRORS_TYPES_H__ */\n" \ $(top_srcdir)/include/ModemManager-errors.h > $@ mm-errors-types.c: Makefile.am $(top_srcdir)/include/ModemManager-errors.h $(top_srcdir)/build-aux/mm-errors-template.c mm-errors-types.h - $(AM_V_GEN) glib-mkenums \ + $(AM_V_GEN) $(GLIB_MKENUMS) \ --fhead "#include <ModemManager-errors.h>\n#include \"mm-errors-types.h\"\n" \ --template $(top_srcdir)/build-aux/mm-errors-template.h \ $(top_srcdir)/include/ModemManager-errors.h > $@ diff --git a/src/Makefile.am b/src/Makefile.am index f833711a..81a268de 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -38,14 +38,14 @@ SERIAL_ENUMS = \ mm-at-serial-port.h mm-serial-enums-types.h: Makefile.am $(SERIAL_ENUMS) $(top_srcdir)/build-aux/mm-enums-template.h - $(AM_V_GEN) glib-mkenums \ + $(AM_V_GEN) $(GLIB_MKENUMS) \ --fhead "#include \"mm-port.h\"\n#include \"mm-at-serial-port.h\"\n#ifndef __MM_SERIAL_ENUMS_TYPES_H__\n#define __MM_SERIAL_ENUMS_TYPES_H__\n" \ --template $(top_srcdir)/build-aux/mm-enums-template.h \ --ftail "#endif /* __MM_SERIAL_ENUMS_TYPES_H__ */\n" \ $(SERIAL_ENUMS) > $@ mm-serial-enums-types.c: Makefile.am $(top_srcdir)/build-aux/mm-enums-template.c mm-serial-enums-types.h - $(AM_V_GEN) glib-mkenums \ + $(AM_V_GEN) $(GLIB_MKENUMS) \ --fhead "#include \"mm-serial-enums-types.h\"" \ --template $(top_srcdir)/build-aux/mm-enums-template.c \ $(SERIAL_ENUMS) > $@ @@ -76,14 +76,14 @@ libserial_la_SOURCES = \ DAEMON_ENUMS = mm-bearer.h mm-daemon-enums-types.h: Makefile.am $(DAEMON_ENUMS) $(top_srcdir)/build-aux/mm-enums-template.h - $(AM_V_GEN) glib-mkenums \ + $(AM_V_GEN) $(GLIB_MKENUMS) \ --fhead "#include \"mm-bearer.h\"\n#ifndef __MM_DAEMON_ENUMS_TYPES_H__\n#define __MM_DAEMON_ENUMS_TYPES_H__\n" \ --template $(top_srcdir)/build-aux/mm-enums-template.h \ --ftail "#endif /* __MM_DAEMON_ENUMS_TYPES_H__ */\n" \ $(DAEMON_ENUMS) > $@ mm-daemon-enums-types.c: Makefile.am $(top_srcdir)/build-aux/mm-enums-template.c mm-daemon-enums-types.h - $(AM_V_GEN) glib-mkenums \ + $(AM_V_GEN) $(GLIB_MKENUMS) \ --fhead "#include \"mm-daemon-enums-types.h\"" \ --template $(top_srcdir)/build-aux/mm-enums-template.c \ $(DAEMON_ENUMS) > $@ |