← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/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:
src/Makefile.am
183
183
                nm-dhcp6-config.c \
184
184
                nm-dhcp6-config.h \
185
185
                nm-rfkill.h \
186
 
                nm-session-monitor.c \
187
 
                nm-session-monitor.h
 
186
                nm-session-monitor.h \
 
187
                nm-session-utils.c \
 
188
                nm-session-utils.h
 
189
 
 
190
if SESSION_TRACKING_SYSTEMD
 
191
NetworkManager_SOURCES += nm-session-monitor-systemd.c
 
192
else
 
193
if SESSION_TRACKING_CK
 
194
NetworkManager_SOURCES += nm-session-monitor-ck.c
 
195
else
 
196
NetworkManager_SOURCES += nm-session-monitor-null.c
 
197
endif
 
198
endif
188
199
 
189
200
nm-access-point-glue.h: $(top_srcdir)/introspection/nm-access-point.xml
190
201
        $(AM_V_GEN) dbus-binding-tool --prefix=nm_access_point --mode=glib-server --output=$@ $<
251
262
        $(LIBNL_CFLAGS) \
252
263
        $(GMODULE_CFLAGS) \
253
264
        $(POLKIT_CFLAGS) \
 
265
        $(SYSTEMD_CFLAGS) \
254
266
        -DG_DISABLE_DEPRECATED \
255
267
        -DBINDIR=\"$(bindir)\" \
256
268
        -DSBINDIR=\"$(sbindir)\" \
285
297
        $(LIBNL_LIBS) \
286
298
        $(GMODULE_LIBS) \
287
299
        $(POLKIT_LIBS) \
 
300
        $(SYSTEMD_LIBS) \
288
301
        $(LIBM) \
289
302
        $(LIBDL)
290
303