diff options
| author | Tambet Ingo <tambet@gmail.com> | 2007-08-13 07:54:28 +0000 |
|---|---|---|
| committer | Tambet Ingo <tambet@gmail.com> | 2007-08-13 07:54:28 +0000 |
| commit | fbe9becbd4d0d2b7e8565ac7373d67e53cf904ca (patch) | |
| tree | 7081efd243a80a9e30f61f4ef592fec48f7c9162 /test | |
| parent | 931927a723a2f0b524ce81a5d15072fd71fb417d (diff) | |
| download | NetworkManager-fbe9becbd4d0d2b7e8565ac7373d67e53cf904ca.tar.gz | |
2007-08-13 Tambet Ingo <tambet@gmail.com>
* 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
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.am | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index 8f7a03cf97..cf25cf45c2 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -13,7 +13,6 @@ AM_CPPFLAGS = \ $(HAL_CFLAGS) \ -DDBUS_API_SUBJECT_TO_CHANGE \ -DBINDIR=\"$(bindir)\" \ - -DWPA_SUPPLICANT_BIN=\"$(WPA_SUPPLICANT_BINARY_PATH)\" \ -DNM_RUN_DIR=\"$(rundir)\" \ -DDATADIR=\"$(datadir)\" @@ -25,7 +24,7 @@ noinst_PROGRAMS = nm-tool \ 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-glib/libnm_glib.la \ $(top_builddir)/libnm-util/libnm-util.la nm_online_SOURCES = nm-online.c @@ -42,8 +41,8 @@ nmtestdevices_LDADD = $(DBUS_LIBS) $(GTHREAD_LIBS) \ 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)/gnome/libnm_glib/libnm_glib.la \ $(top_builddir)/libnm-util/libnm-util.la nm_supplicant_test_SOURCES = nm-supplicant-test.c |