marshallers: integrate them into the daemon compilation

This commit is contained in:
Aleksander Morgado
2012-02-27 16:35:42 +01:00
parent f42eb8684b
commit c55b5d097e
7 changed files with 23 additions and 33 deletions

2
.gitignore vendored
View File

@@ -28,7 +28,6 @@ libtool
org.freedesktop.ModemManager.service
org.freedesktop.ModemManager.conf
ModemManager.pc
marshallers/mm-marshal.[ch]
callouts/mm-modem-probe
test/lsudev
@@ -37,6 +36,7 @@ src/mm-daemon-enums-types.c
src/mm-daemon-enums-types.h
src/mm-serial-enums-types.c
src/mm-serial-enums-types.h
src/mm-marshal.[ch]
src/tests/test-modem-helpers
src/tests/test-charsets
src/tests/test-qcdm-serial-port

View File

@@ -1,5 +1,5 @@
SUBDIRS = . marshallers build-aux data include libmm-common libqcdm libwmc src plugins introspection libmm-glib cli po test docs
SUBDIRS = . build-aux data include libmm-common libqcdm libwmc src plugins introspection libmm-glib cli po test docs
DISTCHECK_CONFIGURE_FLAGS = \
--with-udev-base-dir="$$dc_install_base" \

View File

@@ -180,7 +180,6 @@ AM_CONDITIONAL(WMC_STANDALONE, test "yes" = "no")
AC_CONFIG_FILES([
Makefile
marshallers/Makefile
data/Makefile
include/Makefile
build-aux/Makefile

View File

@@ -1,21 +0,0 @@
noinst_LTLIBRARIES = libmarshallers.la
BUILT_SOURCES = \
mm-marshal.h \
mm-marshal.c
libmarshallers_la_SOURCES = mm-marshal-main.c
EXTRA_DIST = mm-marshal.list
CLEANFILES = $(BUILT_SOURCES)
libmarshallers_la_CPPFLAGS = $(MM_CFLAGS)
libmarshallers_la_LIBADD = $(MM_LIBS)
mm-marshal.h: mm-marshal.list
$(AM_V_GEN) $(GLIB_GENMARSHAL) $< --prefix=mm_marshal --header > $@
mm-marshal.c: mm-marshal.list
$(AM_V_GEN) $(GLIB_GENMARSHAL) $< --prefix=mm_marshal --body > $@
mm-marshal-main.c: mm-marshal.c mm-marshal.h

View File

@@ -1,2 +0,0 @@
#include "mm-marshal.h"
#include "mm-marshal.c"

View File

@@ -7,9 +7,6 @@ udevrules_DATA = \
77-mm-platform-serial-whitelist.rules \
80-mm-candidate.rules
EXTRA_DIST = \
$(udevrules_DATA)
noinst_LTLIBRARIES = libmodem-helpers.la libserial.la
libmodem_helpers_la_CPPFLAGS = \
@@ -89,6 +86,15 @@ mm-daemon-enums-types.c: Makefile.am $(top_srcdir)/build-aux/mm-enums-template.c
--template $(top_srcdir)/build-aux/mm-enums-template.c \
$(DAEMON_ENUMS) > $@
# Marshallers
mm-marshal.h: mm-marshal.list
$(AM_V_GEN) $(GLIB_GENMARSHAL) $< --prefix=mm_marshal --header > $@
mm-marshal.c: mm-marshal.list mm-marshal.h
$(AM_V_GEN) echo "#include \"mm-marshal.h\"" > $@ && \
$(GLIB_GENMARSHAL) $< --prefix=mm_marshal --body >> $@
sbin_PROGRAMS = modem-manager
modem_manager_CPPFLAGS = \
@@ -99,7 +105,6 @@ modem_manager_CPPFLAGS = \
-I$(top_builddir)/include \
-I$(top_srcdir)/libmm-common \
-I$(top_builddir)/libmm-common \
-I${top_builddir}/marshallers \
-DPLUGINDIR=\"$(pkglibdir)\"
if WITH_POLKIT
@@ -109,7 +114,6 @@ endif
modem_manager_LDADD = \
$(MM_LIBS) \
$(GUDEV_LIBS) \
$(top_builddir)/marshallers/libmarshallers.la \
$(builddir)/libmodem-helpers.la \
$(builddir)/libserial.la \
$(top_builddir)/libqcdm/src/libqcdm.la
@@ -120,6 +124,8 @@ endif
modem_manager_SOURCES = \
main.c \
mm-marshal.h \
mm-marshal.c \
mm-log.c \
mm-log.h \
mm-daemon-enums-types.h \
@@ -187,6 +193,14 @@ modem_manager_SOURCES += \
mm-auth-provider-polkit.h
endif
EXTRA_DIST = \
$(udevrules_DATA) \
mm-marshal.list
CLEANFILES = \
mm-private-enums-types.h \
mm-private-enums-types.c
mm-marshal.h \
mm-marshal.c \
mm-daemon-enums-types.h \
mm-daemon-enums-types.c \
mm-serial-enums-types.h \
mm-serial-enums-types.c