mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-01-02 12:20:12 +01:00
fbe9becbd4
* libnm-glib/libnm-glib.pc.in: Rename to libnm_glib.pc.in.
* libnm-glib/Makefile.am: Add legacy libnm_glib.[ch] to the
* build.
Rename the library from libnm-glib to libnm_glib to maintain the
library API
compatibility with 0.6 branch.
* Makefile.am: Remove gnome/ SUBDIR.
* gnome/libnm_glib/libnm_glib.[ch]: Move to libnm-glib/.
* src/Makefile.am: Remove the WPA_SUPPLICANT_BIN define.
* dispatcher-daemon/Makefile.am: Link the binary with
* libnm_glib.
* configure.in: Remove GNOME checks, NetworkManager does not
* need any of these
anymore.
Remove checks for wpa_supplicant binary, it's used over dbus.
Remove gnome/ directory files form AC_OUTPUT, that directory is
getting moved.
* test/Makefile.am: Remove define WPA_SUPPLICANT_BIN.
Link the binaries with libnm_glib.la.
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2669 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
49 lines
1.5 KiB
Makefile
49 lines
1.5 KiB
Makefile
SUBDIRS=test-common libnm-util
|
|
|
|
INCLUDES = -I${top_srcdir} \
|
|
-I${top_srcdir}/libnm-util \
|
|
-I${top_srcdir}/libnm-glib \
|
|
-I${top_srcdir}/gnome/libnm_glib \
|
|
-I${top_srcdir}/utils \
|
|
-I${top_srcdir}/include
|
|
|
|
AM_CPPFLAGS = \
|
|
$(DBUS_CFLAGS) \
|
|
$(GTHREAD_CFLAGS) \
|
|
$(HAL_CFLAGS) \
|
|
-DDBUS_API_SUBJECT_TO_CHANGE \
|
|
-DBINDIR=\"$(bindir)\" \
|
|
-DNM_RUN_DIR=\"$(rundir)\" \
|
|
-DDATADIR=\"$(datadir)\"
|
|
|
|
noinst_PROGRAMS = nm-tool \
|
|
nm-online \
|
|
nminfotest \
|
|
nmtestdevices \
|
|
libnm_glib_test
|
|
|
|
nm_tool_SOURCES = nm-tool.c
|
|
nm_tool_LDADD = $(DBUS_LIBS) $(GTHREAD_LIBS) $(HAL_LIBS) \
|
|
$(top_builddir)/libnm-glib/libnm_glib.la \
|
|
$(top_builddir)/libnm-util/libnm-util.la
|
|
|
|
nm_online_SOURCES = nm-online.c
|
|
nm_online_LDADD = $(DBUS_LIBS) $(GTHREAD_LIBS) $(HAL_LIBS) \
|
|
$(top_builddir)/utils/libnmutils.la
|
|
|
|
nminfotest_SOURCES = nminfotest.c
|
|
nminfotest_LDADD = $(DBUS_LIBS) $(GTHREAD_LIBS) \
|
|
$(top_builddir)/utils/libnmutils.la
|
|
|
|
nmtestdevices_SOURCES = nmtestdevices.c
|
|
nmtestdevices_LDADD = $(DBUS_LIBS) $(GTHREAD_LIBS) \
|
|
$(top_builddir)/utils/libnmutils.la
|
|
|
|
libnm_glib_test_SOURCES = libnm_glib_test.c
|
|
libnm_glib_test_LDADD = $(DBUS_LIBS) $(GTHREAD_LIBS) \
|
|
$(top_builddir)/libnm-glib/libnm_glib.la \
|
|
$(top_builddir)/utils/libnmutils.la \
|
|
$(top_builddir)/libnm-util/libnm-util.la
|
|
|
|
nm_supplicant_test_SOURCES = nm-supplicant-test.c
|
|
nm_supplicant_test_LDADD = $(GLIB_LIBS) $(GTHREAD_LIBS)
|