mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-10-15 12:34:55 +00:00
2008-04-05 Dan Williams <dcbw@redhat.com>
* Makefile.am configure.in marshallers/Makefile.am marshallers/nm-marshal-main.c marshallers/nm-marshal.list - Consolidate marshallers * libnm-glib/nm-marshal-main.c libnm-glib/nm-marshal.list src/marshallers/Makefile.am src/marshallers/nm-marshal-main.c src/marshallers/nm-marshal.list - Remove * libnm-glib/Makefile.am src/Makefile.am src/dhcp-manager/Makefile.am src/ppp-manager/Makefile.am src/supplicant-manager/Makefile.am src/vpn-manager/Makefile.am - Use consolidated marshallers git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3533 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
parent
2b982089c9
commit
0422784433
24
ChangeLog
24
ChangeLog
|
@ -1,3 +1,27 @@
|
|||
2008-04-05 Dan Williams <dcbw@redhat.com>
|
||||
|
||||
* Makefile.am
|
||||
configure.in
|
||||
marshallers/Makefile.am
|
||||
marshallers/nm-marshal-main.c
|
||||
marshallers/nm-marshal.list
|
||||
- Consolidate marshallers
|
||||
|
||||
* libnm-glib/nm-marshal-main.c
|
||||
libnm-glib/nm-marshal.list
|
||||
src/marshallers/Makefile.am
|
||||
src/marshallers/nm-marshal-main.c
|
||||
src/marshallers/nm-marshal.list
|
||||
- Remove
|
||||
|
||||
* libnm-glib/Makefile.am
|
||||
src/Makefile.am
|
||||
src/dhcp-manager/Makefile.am
|
||||
src/ppp-manager/Makefile.am
|
||||
src/supplicant-manager/Makefile.am
|
||||
src/vpn-manager/Makefile.am
|
||||
- Use consolidated marshallers
|
||||
|
||||
2008-04-04 Dan Williams <dcbw@redhat.com>
|
||||
|
||||
* src/nm-hal-manager.c
|
||||
|
|
|
@ -22,6 +22,7 @@ clean:
|
|||
endif
|
||||
|
||||
SUBDIRS = \
|
||||
marshallers \
|
||||
libnm-util \
|
||||
libnm-glib \
|
||||
src \
|
||||
|
|
|
@ -289,7 +289,7 @@ AC_CONFIG_FILES([
|
|||
Makefile
|
||||
include/Makefile
|
||||
src/Makefile
|
||||
src/marshallers/Makefile
|
||||
marshallers/Makefile
|
||||
src/named-manager/Makefile
|
||||
src/vpn-manager/Makefile
|
||||
src/dhcp-manager/Makefile
|
||||
|
|
|
@ -1,4 +1,7 @@
|
|||
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/libnm-util
|
||||
INCLUDES = \
|
||||
-I$(top_srcdir)/include \
|
||||
-I$(top_srcdir)/libnm-util \
|
||||
-I$(top_builddir)/marshallers
|
||||
|
||||
BUILT_SOURCES = \
|
||||
nm-access-point-bindings.h \
|
||||
|
@ -6,8 +9,6 @@ BUILT_SOURCES = \
|
|||
nm-device-bindings.h \
|
||||
nm-device-802-3-ethernet-bindings.h \
|
||||
nm-device-802-11-wireless-bindings.h \
|
||||
nm-marshal.h \
|
||||
nm-marshal.c \
|
||||
nm-exported-connection-glue.h \
|
||||
nm-settings-glue.h \
|
||||
nm-vpn-connection-bindings.h \
|
||||
|
@ -59,7 +60,6 @@ libnm_glib_la_SOURCES = \
|
|||
nm-gsm-device.c \
|
||||
nm-cdma-device.c \
|
||||
nm-vpn-connection.c \
|
||||
nm-marshal-main.c \
|
||||
nm-types.c \
|
||||
nm-types-private.h \
|
||||
nm-object-cache.c \
|
||||
|
@ -68,6 +68,7 @@ libnm_glib_la_SOURCES = \
|
|||
|
||||
libnm_glib_la_LIBADD = \
|
||||
$(top_builddir)/libnm-util/libnm-util.la \
|
||||
$(top_builddir)/marshallers/libmarshallers.la \
|
||||
$(GLIB_LIBS) \
|
||||
$(GTHREAD_LIBS) \
|
||||
$(DBUS_LIBS) \
|
||||
|
@ -85,20 +86,6 @@ libnm_glib_vpn_la_CFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS)
|
|||
libnm_glib_vpn_la_LIBADD = $(top_builddir)/libnm-util/libnm-util.la $(GLIB_LIBS) $(DBUS_LIBS)
|
||||
|
||||
|
||||
nm-marshal.h: Makefile.am nm-marshal.list
|
||||
$(GLIB_GENMARSHAL) --prefix=nm_marshal $(srcdir)/nm-marshal.list --header > \
|
||||
xgen-gmh \
|
||||
&& (cmp -s xgen-gmh nm-marshal.h || cp xgen-gmh nm-marshal.h) \
|
||||
&& rm -f xgen-gmh xgen-gmh~
|
||||
|
||||
nm-marshal.c: Makefile.am nm-marshal.list
|
||||
$(GLIB_GENMARSHAL) --prefix=nm_marshal $(srcdir)/nm-marshal.list --body > \
|
||||
xgen-gmc \
|
||||
&& cp xgen-gmc nm-marshal.c \
|
||||
&& rm -f xgen-gmc xgen-gmc~
|
||||
|
||||
nm-marshal-main.c: nm-marshal.c nm-marshal.h
|
||||
|
||||
nm-client-bindings.h: $(top_srcdir)/introspection/nm-manager-client.xml
|
||||
dbus-binding-tool --prefix=nm_client --mode=glib-client --output=nm-client-bindings.h $(top_srcdir)/introspection/nm-manager-client.xml
|
||||
|
||||
|
@ -134,7 +121,7 @@ pkgconfig_DATA = libnm_glib.pc
|
|||
|
||||
DISTCLEANFILES = libnm_glib.pc
|
||||
|
||||
EXTRA_DIST = libnm_glib.pc.in nm-marshal.list
|
||||
EXTRA_DIST = libnm_glib.pc.in
|
||||
|
||||
CLEANFILES = \
|
||||
$(BUILT_SOURCES)
|
||||
|
|
|
@ -1,2 +0,0 @@
|
|||
VOID:STRING,INT
|
||||
VOID:UINT,UINT
|
|
@ -9,4 +9,5 @@ VOID:STRING,STRING
|
|||
VOID:STRING,UCHAR
|
||||
VOID:STRING,OBJECT
|
||||
VOID:OBJECT,UINT,UINT
|
||||
VOID:STRING,INT
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
SUBDIRS= \
|
||||
marshallers \
|
||||
named-manager \
|
||||
vpn-manager \
|
||||
dhcp-manager \
|
||||
|
@ -9,7 +8,7 @@ SUBDIRS= \
|
|||
|
||||
INCLUDES = -I${top_srcdir} \
|
||||
-I${top_srcdir}/include \
|
||||
-I${top_builddir}/src/marshallers \
|
||||
-I${top_builddir}/marshallers \
|
||||
-I${top_srcdir}/src/named-manager \
|
||||
-I${top_srcdir}/src/vpn-manager \
|
||||
-I${top_srcdir}/src/dhcp-manager \
|
||||
|
@ -134,7 +133,7 @@ NetworkManager_LDADD = \
|
|||
$(GTHREAD_LIBS) \
|
||||
$(HAL_LIBS) \
|
||||
$(LIBNL_LIBS) \
|
||||
./marshallers/libmarshallers.la \
|
||||
$(top_builddir)/marshallers/libmarshallers.la \
|
||||
./named-manager/libnamed-manager.la \
|
||||
./vpn-manager/libvpn-manager.la \
|
||||
./dhcp-manager/libdhcp-manager.la \
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
INCLUDES = \
|
||||
-I${top_srcdir} \
|
||||
-I${top_srcdir}/include \
|
||||
-I${top_builddir}/src/marshallers \
|
||||
-I${top_builddir}/marshallers \
|
||||
-I${top_srcdir}/libnm-util \
|
||||
-I${top_srcdir}/src \
|
||||
-I${top_srcdir}/src/named-manager
|
||||
|
@ -30,7 +30,7 @@ libdhcp_manager_la_CPPFLAGS = \
|
|||
libdhcp_manager_la_LIBADD = \
|
||||
$(DBUS_LIBS) \
|
||||
$(GTHREAD_LIBS) \
|
||||
$(top_builddir)/src/marshallers/libmarshallers.la
|
||||
$(top_builddir)/marshallers/libmarshallers.la
|
||||
|
||||
CLEANFILES = $(BUILT_SOURCES)
|
||||
|
||||
|
|
|
@ -1,2 +0,0 @@
|
|||
#include "nm-marshal.h"
|
||||
#include "nm-marshal.c"
|
|
@ -3,7 +3,7 @@ INCLUDES = \
|
|||
-I${top_srcdir}/include \
|
||||
-I${top_srcdir}/libnm-util \
|
||||
-I${top_srcdir}/src \
|
||||
-I${top_builddir}/src/marshallers
|
||||
-I${top_builddir}/marshallers
|
||||
|
||||
noinst_LTLIBRARIES = libppp-manager.la
|
||||
|
||||
|
@ -30,7 +30,7 @@ libppp_manager_la_CPPFLAGS = \
|
|||
libppp_manager_la_LIBADD = \
|
||||
$(DBUS_LIBS) \
|
||||
$(GLIB_LIBS) \
|
||||
$(top_builddir)/src/marshallers/libmarshallers.la
|
||||
$(top_builddir)/marshallers/libmarshallers.la
|
||||
|
||||
pppd_plugindir = $(PPPD_PLUGIN_DIR)
|
||||
pppd_plugin_LTLIBRARIES = nm-pppd-plugin.la
|
||||
|
|
|
@ -2,7 +2,7 @@ INCLUDES = \
|
|||
-I${top_srcdir}/src \
|
||||
-I${top_srcdir}/include \
|
||||
-I${top_srcdir}/libnm-util \
|
||||
-I${top_builddir}/src/marshallers \
|
||||
-I${top_builddir}/marshallers \
|
||||
-I${top_srcdir}/src/named-manager
|
||||
|
||||
noinst_LTLIBRARIES = libsupplicant-manager.la
|
||||
|
@ -29,7 +29,7 @@ libsupplicant_manager_la_CPPFLAGS = \
|
|||
libsupplicant_manager_la_LIBADD = \
|
||||
$(DBUS_LIBS) \
|
||||
$(GTHREAD_LIBS) \
|
||||
$(top_builddir)/src/marshallers/libmarshallers.la
|
||||
$(top_builddir)/marshallers/libmarshallers.la
|
||||
|
||||
$(libsupplicant_manager_la_OBJECTS): $(BUILT_SOURCES)
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@ INCLUDES = \
|
|||
-I${top_srcdir}/include \
|
||||
-I${top_srcdir}/libnm-util \
|
||||
-I${top_srcdir}/src \
|
||||
-I${top_builddir}/src/marshallers \
|
||||
-I${top_builddir}/marshallers \
|
||||
-I${top_srcdir}/src/named-manager \
|
||||
-DVPN_NAME_FILES_DIR=\""$(sysconfdir)/NetworkManager/VPN"\"
|
||||
|
||||
|
@ -25,7 +25,7 @@ libvpn_manager_la_CPPFLAGS = \
|
|||
libvpn_manager_la_LIBADD = \
|
||||
$(DBUS_LIBS) \
|
||||
$(GTHREAD_LIBS) \
|
||||
$(top_builddir)/src/marshallers/libmarshallers.la \
|
||||
$(top_builddir)/marshallers/libmarshallers.la \
|
||||
$(top_builddir)/libnm-util/libnm-util.la
|
||||
|
||||
nm-vpn-connection-glue.h: $(top_srcdir)/introspection/nm-vpn-connection.xml
|
||||
|
|
Loading…
Reference in a new issue