colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: renamed files holding daemon-specific enum types

Browse Source
This commit is contained in:
Aleksander Morgado
2012-02-13 11:58:06 +01:00
parent 71c3c8d8e5
commit ffdb034413
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Makefile.am
View File

@@ -54,20 +54,20 @@ libserial_la_SOURCES = \
mm-qcdm-serial-port.h
# Daemon specific enum types
WITH_ENUMS = mm-bearer.h
DAEMON_ENUMS = mm-bearer.h
mm-private-enums-types.h: Makefile.am $(WITH_ENUMS) $(top_srcdir)/build-aux/mm-enums-template.h
mm-daemon-enums-types.h: Makefile.am $(DAEMON_ENUMS) $(top_srcdir)/build-aux/mm-enums-template.h
$(AM_V_GEN) glib-mkenums \
--fhead "#include \"mm-bearer.h\"\n#ifndef __MM_PRIVATE_ENUMS_TYPES_H__\n#define __MM_PRIVATE_ENUMS_TYPES_H__\n" \
--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_PRIVATE_ENUMS_TYPES_H__ */\n" \
$(WITH_ENUMS) > $@
--ftail "#endif /* __MM_DAEMON_ENUMS_TYPES_H__ */\n" \
$(DAEMON_ENUMS) > $@
mm-private-enums-types.c: Makefile.am $(top_srcdir)/include/ModemManager-enums.h $(top_srcdir)/build-aux/mm-enums-template.c mm-private-enums-types.h
mm-daemon-enums-types.c: Makefile.am $(top_srcdir)/include/ModemManager-enums.h $(top_srcdir)/build-aux/mm-enums-template.c mm-daemon-enums-types.h
$(AM_V_GEN) glib-mkenums \
--fhead "#include \"mm-private-enums-types.h\"" \
--fhead "#include \"mm-daemon-enums-types.h\"" \
--template $(top_srcdir)/build-aux/mm-enums-template.c \
$(WITH_ENUMS) > $@
$(DAEMON_ENUMS) > $@
sbin_PROGRAMS = modem-manager
@@ -117,8 +117,8 @@ modem_manager_SOURCES = \
main.c \
mm-log.c \
mm-log.h \
mm-private-enums-types.h \
mm-private-enums-types.c \
mm-daemon-enums-types.h \
mm-daemon-enums-types.c \
mm-private-boxed-types.h \
mm-private-boxed-types.c \
mm-callback-info.c \

2
src/mm-bearer.c
View File

@@ -25,7 +25,7 @@
#include <ModemManager.h>
#include <libmm-common.h>
#include "mm-private-enums-types.h"
#include "mm-daemon-enums-types.h"
#include "mm-iface-modem.h"
#include "mm-bearer.h"
#include "mm-base-modem-at.h"