|
Daniel Drake |
1321eb9 |
Index: NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/configure.ac
|
|
Daniel Drake |
1321eb9 |
===================================================================
|
|
Daniel Drake |
1321eb9 |
--- NetworkManager-0.9.2.0.orig/network-manager-applet-0.9.2.0/configure.ac
|
|
Daniel Drake |
1321eb9 |
+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/configure.ac
|
|
Daniel Drake |
1321eb9 |
@@ -98,10 +98,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0)
|
|
 |
a03c871 |
PKG_CHECK_MODULES(NMA,
|
|
|
e7172c7 |
[dbus-glib-1 >= 0.74
|
|
|
60d6eae |
glib-2.0 >= 2.16
|
|
|
04ba8e9 |
- NetworkManager >= 0.9.2
|
|
|
04ba8e9 |
- libnm-glib >= 0.9.2
|
|
|
04ba8e9 |
- libnm-util >= 0.9.2
|
|
|
04ba8e9 |
- libnm-glib-vpn >= 0.9.2
|
|
|
65bc38d |
gmodule-export-2.0])
|
|
|
65bc38d |
|
|
|
65bc38d |
PKG_CHECK_MODULES(GCONF, [gconf-2.0])
|
|
Daniel Drake |
1321eb9 |
@@ -167,8 +163,7 @@ case "${with_bluetooth}" in
|
|
|
c52f751 |
AC_MSG_CHECKING(for gnome-bluetooth)
|
|
|
c52f751 |
PKG_CHECK_MODULES(GNOME_BLUETOOTH,
|
|
Daniel Drake |
1321eb9 |
gnome-bluetooth-1.0 >= 2.27.6
|
|
|
04ba8e9 |
- libnm-util >= 0.9.2
|
|
|
04ba8e9 |
- libnm-glib >= 0.9.2,
|
|
Daniel Drake |
1321eb9 |
+ dbus-glib-1,
|
|
|
c52f751 |
have_gbt=yes, have_gbt=no)
|
|
|
c52f751 |
;;
|
|
|
c52f751 |
esac
|
|
Daniel Drake |
1321eb9 |
Index: NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/connection-editor/Makefile.am
|
|
Daniel Drake |
1321eb9 |
===================================================================
|
|
Daniel Drake |
1321eb9 |
--- NetworkManager-0.9.2.0.orig/network-manager-applet-0.9.2.0/src/connection-editor/Makefile.am
|
|
Daniel Drake |
1321eb9 |
+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/connection-editor/Makefile.am
|
|
|
e7172c7 |
@@ -1,5 +1,9 @@
|
|
|
5562f2d |
bin_PROGRAMS = nm-connection-editor
|
|
|
5562f2d |
|
|
|
5562f2d |
+INCLUDES = -I${top_srcdir}/../include \
|
|
|
5562f2d |
+ -I${top_srcdir}/../libnm-util \
|
|
|
5562f2d |
+ -I${top_srcdir}/../libnm-glib
|
|
|
5562f2d |
+
|
|
|
1395c7d |
nm_connection_editor_CPPFLAGS = \
|
|
|
65bc38d |
$(GTK_CFLAGS) \
|
|
|
1395c7d |
$(NMA_CFLAGS) \
|
|
Daniel Drake |
1321eb9 |
@@ -66,7 +70,10 @@ nm_connection_editor_LDADD = \
|
|
|
39811eb |
${top_builddir}/src/libnm-gtk/libnm-gtk.la \
|
|
|
65bc38d |
$(GTK_LIBS) \
|
|
|
029921f |
$(NMA_LIBS) \
|
|
|
029921f |
- -lm
|
|
|
029921f |
+ -lm \
|
|
|
5562f2d |
+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
|
|
|
60d6eae |
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la \
|
|
|
029921f |
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib-vpn.la
|
|
|
5562f2d |
|
|
|
65bc38d |
uidir = $(datadir)/nm-applet
|
|
|
65bc38d |
ui_DATA = \
|
|
Daniel Drake |
1321eb9 |
Index: NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gconf-helpers/Makefile.am
|
|
Daniel Drake |
1321eb9 |
===================================================================
|
|
Daniel Drake |
1321eb9 |
--- NetworkManager-0.9.2.0.orig/network-manager-applet-0.9.2.0/src/gconf-helpers/Makefile.am
|
|
Daniel Drake |
1321eb9 |
+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gconf-helpers/Makefile.am
|
|
|
65bc38d |
@@ -1,5 +1,9 @@
|
|
|
65bc38d |
SUBDIRS=. tests
|
|
|
65bc38d |
|
|
|
b6bef11 |
+INCLUDES = -I${top_srcdir}/../include \
|
|
|
b6bef11 |
+ -I${top_srcdir}/../libnm-util \
|
|
|
b6bef11 |
+ -I${top_srcdir}/../libnm-glib
|
|
|
b6bef11 |
+
|
|
|
65bc38d |
noinst_LTLIBRARIES = \
|
|
|
65bc38d |
libgconf-helpers.la \
|
|
|
65bc38d |
libgconf-helpers-test.la
|
|
|
65bc38d |
@@ -23,7 +27,9 @@ libgconf_helpers_la_LIBADD = \
|
|
|
65bc38d |
$(GTK_LIBS) \
|
|
|
f27fa1f |
$(NMA_LIBS) \
|
|
|
65bc38d |
$(GCONF_LIBS) \
|
|
|
65bc38d |
- $(GNOME_KEYRING_LIBS)
|
|
|
65bc38d |
+ $(GNOME_KEYRING_LIBS) \
|
|
|
65bc38d |
+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
|
|
|
65bc38d |
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
|
|
|
65bc38d |
|
|
|
65bc38d |
#########################
|
|
|
65bc38d |
# Test library
|
|
|
65bc38d |
@@ -40,5 +46,7 @@ libgconf_helpers_test_la_CPPFLAGS = \
|
|
|
65bc38d |
|
|
|
65bc38d |
# no keyring or gconf libs since we'll override them
|
|
|
65bc38d |
libgconf_helpers_test_la_LIBADD = \
|
|
|
65bc38d |
- $(NMA_LIBS)
|
|
|
65bc38d |
+ $(NMA_LIBS) \
|
|
|
b6bef11 |
+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
|
|
|
60d6eae |
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
|
|
|
b6bef11 |
|
|
Daniel Drake |
1321eb9 |
Index: NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gconf-helpers/tests/Makefile.am
|
|
Daniel Drake |
1321eb9 |
===================================================================
|
|
Daniel Drake |
1321eb9 |
--- NetworkManager-0.9.2.0.orig/network-manager-applet-0.9.2.0/src/gconf-helpers/tests/Makefile.am
|
|
Daniel Drake |
1321eb9 |
+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gconf-helpers/tests/Makefile.am
|
|
|
65bc38d |
@@ -1,4 +1,7 @@
|
|
|
65bc38d |
-INCLUDES = -I$(top_srcdir)/src/utils
|
|
|
65bc38d |
+INCLUDES = -I$(top_srcdir)/src/utils \
|
|
|
65bc38d |
+ -I${top_srcdir}/../include \
|
|
|
65bc38d |
+ -I${top_srcdir}/../libnm-util \
|
|
|
65bc38d |
+ -I${top_srcdir}/../libnm-glib
|
|
|
65bc38d |
|
|
|
65bc38d |
noinst_PROGRAMS = test-upgrade
|
|
|
65bc38d |
|
|
Daniel Drake |
1321eb9 |
Index: NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gnome-bluetooth/Makefile.am
|
|
Daniel Drake |
1321eb9 |
===================================================================
|
|
Daniel Drake |
1321eb9 |
--- NetworkManager-0.9.2.0.orig/network-manager-applet-0.9.2.0/src/gnome-bluetooth/Makefile.am
|
|
Daniel Drake |
1321eb9 |
+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gnome-bluetooth/Makefile.am
|
|
|
fb480f3 |
@@ -6,6 +6,9 @@ INCLUDES = \
|
|
|
d80f4aa |
-I${top_builddir}/src/marshallers \
|
|
|
d80f4aa |
-I${top_srcdir}/src/utils \
|
|
|
39811eb |
-I${top_srcdir}/src/libnm-gtk \
|
|
|
fb480f3 |
+ -I${top_srcdir}/../include \
|
|
|
fb480f3 |
+ -I${top_srcdir}/../libnm-util \
|
|
|
fb480f3 |
+ -I${top_srcdir}/../libnm-glib \
|
|
|
fb480f3 |
$(GNOME_BLUETOOTH_CFLAGS) \
|
|
|
e58e81d |
$(DISABLE_DEPRECATED) \
|
|
|
fb480f3 |
$(WARN_CFLAGS)
|
|
Daniel Drake |
1321eb9 |
@@ -25,7 +28,9 @@ libnma_la_LIBADD = \
|
|
|
65bc38d |
$(top_builddir)/src/marshallers/libmarshallers.la \
|
|
|
65bc38d |
$(top_builddir)/src/utils/libutils.la \
|
|
|
39811eb |
$(top_builddir)/src/libnm-gtk/libnm-gtk.la \
|
|
|
d80f4aa |
- $(GNOME_BLUETOOTH_LIBS)
|
|
|
7f585d8 |
+ $(GNOME_BLUETOOTH_LIBS) \
|
|
|
7f585d8 |
+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
|
|
|
60d6eae |
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
|
|
|
7f585d8 |
endif
|
|
|
7f585d8 |
|
|
|
abba078 |
EXTRA_DIST = $(BT_WIDGET_SOURCES)
|
|
Daniel Drake |
1321eb9 |
Index: NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/Makefile.am
|
|
Daniel Drake |
1321eb9 |
===================================================================
|
|
Daniel Drake |
1321eb9 |
--- NetworkManager-0.9.2.0.orig/network-manager-applet-0.9.2.0/src/Makefile.am
|
|
Daniel Drake |
1321eb9 |
+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/Makefile.am
|
|
|
3b35b5a |
@@ -2,6 +2,10 @@ SUBDIRS = marshallers utils gconf-helper
|
|
|
5562f2d |
|
|
|
5562f2d |
bin_PROGRAMS = nm-applet
|
|
|
5562f2d |
|
|
|
5562f2d |
+INCLUDES = -I${top_srcdir}/../include \
|
|
|
5562f2d |
+ -I${top_srcdir}/../libnm-util \
|
|
|
5562f2d |
+ -I${top_srcdir}/../libnm-glib
|
|
|
5562f2d |
+
|
|
|
5562f2d |
nm_applet_CPPFLAGS = \
|
|
|
65bc38d |
$(GTK_CFLAGS) \
|
|
|
5562f2d |
$(NMA_CFLAGS) \
|
|
Daniel Drake |
1321eb9 |
@@ -72,7 +76,9 @@ nm_applet_LDADD = \
|
|
|
5562f2d |
${top_builddir}/src/utils/libutils.la \
|
|
|
5562f2d |
${top_builddir}/src/gconf-helpers/libgconf-helpers.la \
|
|
|
39811eb |
${top_builddir}/src/wireless-security/libwireless-security.la \
|
|
|
39811eb |
- ${top_builddir}/src/libnm-gtk/libnm-gtk.la
|
|
|
39811eb |
+ ${top_builddir}/src/libnm-gtk/libnm-gtk.la \
|
|
|
5562f2d |
+ -L${top_srcdir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
|
|
|
60d6eae |
+ -L${top_srcdir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
|
|
|
5562f2d |
|
|
|
65bc38d |
uidir = $(datadir)/nm-applet
|
|
|
39811eb |
ui_DATA = gsm-unlock.ui info.ui wired-8021x.ui keyring.png
|
|
Daniel Drake |
1321eb9 |
Index: NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/utils/Makefile.am
|
|
Daniel Drake |
1321eb9 |
===================================================================
|
|
Daniel Drake |
1321eb9 |
--- NetworkManager-0.9.2.0.orig/network-manager-applet-0.9.2.0/src/utils/Makefile.am
|
|
Daniel Drake |
1321eb9 |
+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/utils/Makefile.am
|
|
|
94cf4e1 |
@@ -1,5 +1,9 @@
|
|
|
94cf4e1 |
SUBDIRS=. tests
|
|
|
94cf4e1 |
|
|
|
798fed6 |
+INCLUDES = -I${top_srcdir}/../include \
|
|
|
798fed6 |
+ -I${top_srcdir}/../libnm-util \
|
|
|
798fed6 |
+ -I${top_srcdir}/../libnm-glib
|
|
|
798fed6 |
+
|
|
|
798fed6 |
noinst_LTLIBRARIES = libutils.la
|
|
|
798fed6 |
|
|
|
798fed6 |
libutils_la_SOURCES = \
|
|
Daniel Drake |
1321eb9 |
@@ -17,3 +21,6 @@ libutils_la_CPPFLAGS = \
|
|
|
87e85fc |
-I${top_srcdir}/src
|
|
|
798fed6 |
|
|
|
65bc38d |
libutils_la_LIBADD = $(GTK_LIBS) $(NMA_LIBS) $(GNOME_KEYRING_LIBS)
|
|
|
65bc38d |
+libutils_la_LIBADD = $(GTK_LIBS) $(NMA_LIBS) $(GNOME_KEYRING_LIBS) \
|
|
|
798fed6 |
+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
|
|
|
60d6eae |
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
|
|
Daniel Drake |
1321eb9 |
Index: NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/utils/tests/Makefile.am
|
|
Daniel Drake |
1321eb9 |
===================================================================
|
|
Daniel Drake |
1321eb9 |
--- NetworkManager-0.9.2.0.orig/network-manager-applet-0.9.2.0/src/utils/tests/Makefile.am
|
|
Daniel Drake |
1321eb9 |
+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/utils/tests/Makefile.am
|
|
|
94cf4e1 |
@@ -1,4 +1,7 @@
|
|
|
94cf4e1 |
-INCLUDES = -I$(top_srcdir)/src/utils
|
|
|
94cf4e1 |
+INCLUDES = -I$(top_srcdir)/src/utils \
|
|
|
94cf4e1 |
+ -I${top_srcdir}/../include \
|
|
|
94cf4e1 |
+ -I${top_srcdir}/../libnm-util \
|
|
|
94cf4e1 |
+ -I${top_srcdir}/../libnm-glib
|
|
|
94cf4e1 |
|
|
|
94cf4e1 |
noinst_PROGRAMS = test-utils
|
|
|
94cf4e1 |
|
|
Daniel Drake |
1321eb9 |
Index: NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/wireless-security/Makefile.am
|
|
Daniel Drake |
1321eb9 |
===================================================================
|
|
Daniel Drake |
1321eb9 |
--- NetworkManager-0.9.2.0.orig/network-manager-applet-0.9.2.0/src/wireless-security/Makefile.am
|
|
Daniel Drake |
1321eb9 |
+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/wireless-security/Makefile.am
|
|
|
2ca88e3 |
@@ -1,5 +1,9 @@
|
|
|
2ca88e3 |
noinst_LTLIBRARIES = libwireless-security.la
|
|
|
2ca88e3 |
|
|
|
2ca88e3 |
+INCLUDES = -I${top_srcdir}/../include \
|
|
|
2ca88e3 |
+ -I${top_srcdir}/../libnm-util \
|
|
|
2ca88e3 |
+ -I${top_srcdir}/../libnm-glib
|
|
|
2ca88e3 |
+
|
|
|
2ca88e3 |
libwireless_security_la_SOURCES = \
|
|
|
2ca88e3 |
wireless-security.h \
|
|
|
2ca88e3 |
wireless-security.c \
|
|
Daniel Drake |
1321eb9 |
@@ -40,7 +44,9 @@ libwireless_security_la_LIBADD = \
|
|
|
65bc38d |
$(GTK_LIBS) \
|
|
|
2ca88e3 |
$(NMA_LIBS) \
|
|
|
65bc38d |
$(GCONF_LIBS) \
|
|
|
65bc38d |
- ${top_builddir}/src/utils/libutils.la
|
|
|
65bc38d |
+ ${top_builddir}/src/utils/libutils.la \
|
|
|
2ca88e3 |
+ -L${top_srcdir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
|
|
|
60d6eae |
+ -L${top_srcdir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
|
|
|
2ca88e3 |
|
|
|
65bc38d |
uidir = $(datadir)/nm-applet
|
|
|
65bc38d |
ui_DATA = \
|
|
Daniel Drake |
1321eb9 |
Index: NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/libnm-gtk/Makefile.am
|
|
Daniel Drake |
1321eb9 |
===================================================================
|
|
Daniel Drake |
1321eb9 |
--- NetworkManager-0.9.2.0.orig/network-manager-applet-0.9.2.0/src/libnm-gtk/Makefile.am
|
|
Daniel Drake |
1321eb9 |
+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/libnm-gtk/Makefile.am
|
|
|
39811eb |
@@ -1,3 +1,7 @@
|
|
|
39811eb |
+INCLUDES = -I${top_srcdir}/../include \
|
|
|
39811eb |
+ -I${top_srcdir}/../libnm-util \
|
|
|
39811eb |
+ -I${top_srcdir}/../libnm-glib
|
|
|
39811eb |
+
|
|
|
39811eb |
uidir = $(datadir)/libnm-gtk
|
|
|
39811eb |
ui_DATA = wifi.ui
|
|
|
39811eb |
|
|
|
04ba8e9 |
@@ -36,7 +40,10 @@ libnm_gtk_la_LIBADD = \
|
|
|
39811eb |
$(NMA_LIBS) \
|
|
|
39811eb |
$(GNOME_KEYRING_LIBS) \
|
|
|
39811eb |
$(top_builddir)/src/marshallers/libmarshallers.la \
|
|
|
39811eb |
- $(top_builddir)/src/wireless-security/libwireless-security.la
|
|
|
39811eb |
+ $(top_builddir)/src/wireless-security/libwireless-security.la \
|
|
|
39811eb |
+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
|
|
|
39811eb |
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la \
|
|
|
39811eb |
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib-vpn.la
|
|
|
39811eb |
|
|
|
04ba8e9 |
libnm_gtk_la_LDFLAGS = -Wl,-no-undefined \
|
|
|
04ba8e9 |
-export-symbols-regex '^nma_.*'
|