diff options
Diffstat (limited to 'src/devices/wifi/Makefile.am')
| -rw-r--r-- | src/devices/wifi/Makefile.am | 37 |
1 files changed, 10 insertions, 27 deletions
diff --git a/src/devices/wifi/Makefile.am b/src/devices/wifi/Makefile.am index 4ac59e3d..b0919ef7 100644 --- a/src/devices/wifi/Makefile.am +++ b/src/devices/wifi/Makefile.am @@ -2,7 +2,9 @@ include $(GLIB_MAKEFILE) @GNOME_CODE_COVERAGE_RULES@ +if ENABLE_TESTS SUBDIRS=. tests +endif AM_CPPFLAGS = \ -I${top_srcdir}/src \ @@ -11,31 +13,15 @@ AM_CPPFLAGS = \ -I${top_srcdir}/src/settings \ -I${top_srcdir}/src/platform \ -I${top_srcdir}/src/supplicant-manager \ - -I${top_srcdir}/include \ - -I$(top_builddir)/include \ + -I${top_builddir}/introspection \ + -I${top_srcdir}/shared \ + -I$(top_builddir)/shared \ -I${top_builddir}/libnm-core \ -I${top_srcdir}/libnm-core \ -DG_LOG_DOMAIN=\""NetworkManager-wifi"\" \ - -DNETWORKMANAGER_COMPILATION \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ - $(DBUS_CFLAGS) - -GLIB_GENERATED = nm-wifi-enum-types.h nm-wifi-enum-types.c -GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM -GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM -nm_wifi_enum_types_sources = \ - $(srcdir)/nm-device-wifi.h \ - $(srcdir)/nm-wifi-ap.h \ - $(srcdir)/nm-device-olpc-mesh.h - -glue_sources = \ - nm-device-wifi-glue.h \ - nm-device-olpc-mesh-glue.h - -%-glue.h: $(top_srcdir)/introspection/%.xml - $(AM_V_GEN) dbus-binding-tool --prefix=$(subst -,_,$(subst -glue.h,,$@)) --mode=glib-server --output=$@ $< - -BUILT_SOURCES = $(GLIB_GENERATED) $(glue_sources) + $(GLIB_CFLAGS) pkglib_LTLIBRARIES = libnm-device-plugin-wifi.la @@ -48,9 +34,7 @@ libnm_device_plugin_wifi_la_SOURCES = \ nm-wifi-ap-utils.c \ nm-wifi-ap-utils.h \ nm-device-olpc-mesh.c \ - nm-device-olpc-mesh.h \ - \ - $(BUILT_SOURCES) + nm-device-olpc-mesh.h SYMBOL_VIS_FILE=$(srcdir)/exports.ver @@ -59,11 +43,10 @@ libnm_device_plugin_wifi_la_LDFLAGS = \ -Wl,--version-script=$(SYMBOL_VIS_FILE) libnm_device_plugin_wifi_la_LIBADD = \ - $(DBUS_LIBS) \ + $(top_builddir)/introspection/libnmdbus.la \ + $(GLIB_LIBS) \ $(GUDEV_LIBS) -CLEANFILES = $(BUILT_SOURCES) - EXTRA_DIST = $(SYMBOL_VIS_FILE) if ENABLE_TESTS |