← Back to branch summary

~ubuntu-branches/ubuntu/precise/network-manager/precise

« back to all changes in this revision

Viewing changes to libnm-glib/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2012-02-09 16:45:41 UTC
  • mfrom: (1.1.53)
  • Revision ID: package-import@ubuntu.com-20120209164541-4h90zknlsfdb7x35
Tags: 0.9.2.0+git201202091925.c721477-0ubuntu1
* upstream snapshot 2012-02-09 19:25:59 (GMT)
  + c721477d11d4fe144111d6d2eec8f93f2e9186c9
* debian/patches/avoid-periodic-disk-wakeups.patch: refreshed.
* debian/patches/nl3-default-ip6-route.patch: refreshed.
* debian/libnm-glib4.symbols: add symbols:
  + nm_active_connection_get_master@Base
  + nm_client_new_async@Base
  + nm_client_new_finish@Base
  + nm_remote_settings_new_async@Base
  + nm_remote_settings_new_finish@Base
  + nm_device_get_state_reason@Base
* debian/libnm-util2.symbols: add symbols:
  + nm_setting_802_1x_get_pac_file@Base
  + nm_setting_infiniband_get_transport_mode@Base

Show diffs side-by-side

added added

removed removed

Lines of Context:
libnm-glib/Makefile.am
7
7
        -I$(top_builddir)/marshallers
8
8
 
9
9
BUILT_SOURCES = \
10
 
        nm-access-point-bindings.h \
11
 
        nm-client-bindings.h \
12
 
        nm-device-bindings.h \
13
 
        nm-device-ethernet-bindings.h \
14
 
        nm-device-infiniband-bindings.h \
15
 
        nm-device-wifi-bindings.h \
16
 
        nm-device-bt-bindings.h \
17
 
        nm-settings-connection-bindings.h \
18
 
        nm-device-wimax-bindings.h \
19
 
        nm-device-modem-bindings.h \
20
 
        nm-settings-bindings.h \
21
 
        nm-vpn-connection-bindings.h \
22
10
        nm-vpn-plugin-glue.h \
23
 
        nm-active-connection-bindings.h \
24
 
        nm-ip4-config-bindings.h \
25
 
        nm-dhcp4-config-bindings.h \
26
 
        nm-ip6-config-bindings.h \
27
 
        nm-dhcp6-config-bindings.h \
28
11
        nm-secret-agent-glue.h
29
12
 
30
13
 
60
43
lib_LTLIBRARIES = libnm-glib.la libnm-glib-vpn.la
61
44
 
62
45
libnm_glib_la_CFLAGS = \
63
 
        $(GLIB_CFLAGS) \
 
46
        $(GIO_CFLAGS) \
64
47
        $(DBUS_CFLAGS) \
65
48
        $(GUDEV_CFLAGS)
66
49
 
98
81
libnm_glib_la_csources = \
99
82
        nm-object.c \
100
83
        nm-client.c \
101
 
        nm-dbus-utils.c \
102
84
        nm-device.c \
103
85
        nm-device-ethernet.c \
104
86
        nm-device-infiniband.c \
122
104
 
123
105
libnm_glib_la_private_headers = \
124
106
        nm-object-private.h \
125
 
        nm-dbus-utils.h \
126
107
        nm-device-private.h \
127
108
        nm-types-private.h \
128
109
        nm-object-cache.h \
136
117
        $(top_builddir)/libnm-util/libnm-util.la \
137
118
        $(top_builddir)/marshallers/libmarshallers.la \
138
119
        $(builddir)/libdeprecated-nm-glib.la \
139
 
        $(GLIB_LIBS) \
 
120
        $(GIO_LIBS) \
140
121
        $(DBUS_LIBS) \
141
122
        $(GUDEV_LIBS)
142
123
 
148
129
noinst_PROGRAMS = libnm-glib-test
149
130
 
150
131
libnm_glib_test_SOURCES = libnm-glib-test.c
151
 
libnm_glib_test_CFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS)
152
 
libnm_glib_test_LDADD = libnm-glib.la $(top_builddir)/libnm-util/libnm-util.la $(GLIB_LIBS) $(DBUS_LIBS)
 
132
libnm_glib_test_CFLAGS = $(GIO_CFLAGS) $(DBUS_CFLAGS)
 
133
libnm_glib_test_LDADD = libnm-glib.la $(top_builddir)/libnm-util/libnm-util.la $(GIO_LIBS) $(DBUS_LIBS)
153
134
 
154
135
 
155
136
libnm_glib_vpn_la_SOURCES = \
156
137
        nm-vpn-plugin.c \
157
138
        nm-vpn-plugin-ui-interface.c \
158
139
        nm-vpn-plugin-utils.c
159
 
libnm_glib_vpn_la_CFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS)
160
 
libnm_glib_vpn_la_LIBADD = $(top_builddir)/libnm-util/libnm-util.la $(GLIB_LIBS) $(DBUS_LIBS)
 
140
libnm_glib_vpn_la_CFLAGS = $(GIO_CFLAGS) $(DBUS_CFLAGS)
 
141
libnm_glib_vpn_la_LIBADD = $(top_builddir)/libnm-util/libnm-util.la $(GIO_LIBS) $(DBUS_LIBS)
161
142
libnm_glib_vpn_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm-glib-vpn.ver \
162
143
        -version-info "2:0:1"
163
144
 
166
147
#####################################################
167
148
 
168
149
libnm_glib_test_la_CFLAGS = \
169
 
        $(GLIB_CFLAGS) \
 
150
        $(GIO_CFLAGS) \
170
151
        $(DBUS_CFLAGS) \
171
152
        $(GUDEV_CFLAGS) \
172
153
        -DLIBNM_GLIB_TEST
178
159
libnm_glib_test_la_LIBADD = \
179
160
        $(top_builddir)/libnm-util/libnm-util.la \
180
161
        $(top_builddir)/marshallers/libmarshallers.la \
181
 
        $(GLIB_LIBS) \
 
162
        $(GIO_LIBS) \
182
163
        $(DBUS_LIBS) \
183
164
        $(GUDEV_LIBS)
184
165
 
185
166
#####################################################
186
167
 
187
 
nm-client-bindings.h: $(top_srcdir)/introspection/nm-manager.xml
188
 
        $(AM_V_GEN) dbus-binding-tool --prefix=nm_client --mode=glib-client --output=$@ $<
189
 
 
190
 
nm-device-bindings.h: $(top_srcdir)/introspection/nm-device.xml
191
 
        $(AM_V_GEN) dbus-binding-tool --prefix=nm_device --mode=glib-client --output=$@ $<
192
 
 
193
 
nm-device-ethernet-bindings.h: $(top_srcdir)/introspection/nm-device-ethernet.xml
194
 
        $(AM_V_GEN) dbus-binding-tool --prefix=nm_device_ethernet --mode=glib-client --output=$@ $<
195
 
 
196
 
nm-device-infiniband-bindings.h: $(top_srcdir)/introspection/nm-device-infiniband.xml
197
 
        $(AM_V_GEN) dbus-binding-tool --prefix=nm_device_infiniband --mode=glib-client --output=$@ $<
198
 
 
199
 
nm-device-wifi-bindings.h: $(top_srcdir)/introspection/nm-device-wifi.xml
200
 
        $(AM_V_GEN) dbus-binding-tool --prefix=nm_device_wifi --mode=glib-client --output=$@ $<
201
 
 
202
 
nm-device-bt-bindings.h: $(top_srcdir)/introspection/nm-device-bt.xml
203
 
        $(AM_V_GEN) dbus-binding-tool --prefix=nm_device_bt --mode=glib-client --output=$@ $<
204
 
 
205
 
nm-access-point-bindings.h: $(top_srcdir)/introspection/nm-access-point.xml
206
 
        $(AM_V_GEN) dbus-binding-tool --prefix=nm_access_point --mode=glib-client --output=$@ $<
207
 
 
208
 
nm-settings-bindings.h: $(top_srcdir)/introspection/nm-settings.xml
209
 
        $(AM_V_GEN) dbus-binding-tool --prefix=nm_settings --mode=glib-client --output=$@ $<
210
 
 
211
 
nm-settings-connection-bindings.h: $(top_srcdir)/introspection/nm-settings-connection.xml
212
 
        $(AM_V_GEN) dbus-binding-tool --prefix=nm_settings_connection --mode=glib-client --output=$@ $<
213
 
 
214
 
nm-vpn-connection-bindings.h: $(top_srcdir)/introspection/nm-vpn-connection.xml
215
 
        $(AM_V_GEN) dbus-binding-tool --prefix=nm_vpn_connection --mode=glib-client --output=$@ $<
216
 
 
217
168
nm-vpn-plugin-glue.h: $(top_srcdir)/introspection/nm-vpn-plugin.xml
218
169
        $(AM_V_GEN) dbus-binding-tool --prefix=nm_vpn_plugin --mode=glib-server --output=$@ $<
219
170
 
220
 
nm-active-connection-bindings.h: $(top_srcdir)/introspection/nm-active-connection.xml
221
 
        $(AM_V_GEN) dbus-binding-tool --prefix=nm_active_connection --mode=glib-client --output=$@ $<
222
 
 
223
 
nm-ip4-config-bindings.h: $(top_srcdir)/introspection/nm-ip4-config.xml
224
 
        $(AM_V_GEN) dbus-binding-tool --prefix=nm_ip4_config --mode=glib-client --output=$@ $<
225
 
 
226
 
nm-dhcp4-config-bindings.h: $(top_srcdir)/introspection/nm-dhcp4-config.xml
227
 
        $(AM_V_GEN) dbus-binding-tool --prefix=nm_dhcp4_config --mode=glib-client --output=$@ $<
228
 
 
229
 
nm-ip6-config-bindings.h: $(top_srcdir)/introspection/nm-ip6-config.xml
230
 
        $(AM_V_GEN) dbus-binding-tool --prefix=nm_ip6_config --mode=glib-client --output=$@ $<
231
 
 
232
 
nm-dhcp6-config-bindings.h: $(top_srcdir)/introspection/nm-dhcp6-config.xml
233
 
        $(AM_V_GEN) dbus-binding-tool --prefix=nm_dhcp6_config --mode=glib-client --output=$@ $<
234
 
 
235
171
nm-secret-agent-glue.h: $(top_srcdir)/introspection/nm-secret-agent.xml
236
172
        $(AM_V_GEN) dbus-binding-tool --prefix=nm_secret_agent --mode=glib-server --output=$@ $<
237
173
 
238
 
nm-device-wimax-bindings.h: $(top_srcdir)/introspection/nm-device-wimax.xml
239
 
        dbus-binding-tool --prefix=nm_device_wimax --mode=glib-client --output=$@ $<
240
 
 
241
 
nm-device-modem-bindings.h: $(top_srcdir)/introspection/nm-device-modem.xml
242
 
        dbus-binding-tool --prefix=nm_device_modem --mode=glib-client --output=$@ $<
243
 
 
244
174
pkgconfigdir = $(libdir)/pkgconfig
245
175
pkgconfig_DATA = libnm-glib.pc libnm-glib-vpn.pc
246
176
 
248
178
 
249
179
EXTRA_DIST = libnm-glib.pc.in libnm-glib-vpn.pc.in libnm-glib.ver libnm-glib-vpn.ver
250
180
 
251
 
CLEANFILES = $(BUILT_SOURCES) *-bindings.h *-glue.h
 
181
CLEANFILES = $(BUILT_SOURCES)
252
182
 
253
183
-include $(INTROSPECTION_MAKEFILE)
254
184
INTROSPECTION_GIRS =
258
188
introspection_sources = $(libnminclude_HEADERS) $(libnm_glib_la_csources)
259
189
 
260
190
NMClient-1.0.gir: libnm-glib.la
261
 
NMClient_1_0_gir_INCLUDES = GObject-2.0 DBusGLib-1.0
262
 
NMClient_1_0_gir_PACKAGES = gobject-2.0 dbus-glib-1 gudev-1.0
 
191
NMClient_1_0_gir_INCLUDES = Gio-2.0 DBusGLib-1.0
 
192
NMClient_1_0_gir_PACKAGES = gio-2.0 dbus-glib-1 gudev-1.0
263
193
NMClient_1_0_gir_CFLAGS = $(INCLUDES) -I$(top_srcdir)/libnm-glib -I$(top_srcdir)/libnm-util
264
194
NMClient_1_0_gir_LIBS = libnm-glib.la
265
195
NMClient_1_0_gir_FILES = $(introspection_sources)