|
 |
033b50a |
diff -up NetworkManager-0.8.1/network-manager-applet-0.8.1/configure.ac.buildfix NetworkManager-0.8.1/network-manager-applet-0.8.1/configure.ac
|
|
|
033b50a |
--- NetworkManager-0.8.1/network-manager-applet-0.8.1/configure.ac.buildfix 2009-07-28 10:01:26.000000000 -0400
|
|
|
033b50a |
+++ NetworkManager-0.8.1/network-manager-applet-0.8.1/configure.ac 2009-07-28 13:11:39.261718877 -0400
|
|
|
3b35b5a |
@@ -70,10 +70,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
|
|
|
033b50a |
- NetworkManager >= 0.8.1
|
|
|
033b50a |
- libnm-glib >= 0.8.1
|
|
|
033b50a |
- libnm-util >= 0.8.1
|
|
|
033b50a |
- libnm-glib-vpn >= 0.8.1
|
|
|
e7172c7 |
gtk+-2.0 >= 2.14
|
|
|
a03c871 |
libglade-2.0
|
|
|
5562f2d |
gmodule-export-2.0
|
|
|
1815fac |
@@ -192,9 +188,7 @@ AC_SUBST(DBUS_SYS_DIR)
|
|
|
f58b3ab |
AC_MSG_CHECKING(for gnome-bluetooth)
|
|
|
f58b3ab |
PKG_CHECK_MODULES(GNOME_BLUETOOTH,
|
|
|
f58b3ab |
gconf-2.0
|
|
|
f58b3ab |
- gnome-bluetooth-1.0 >= 2.27.6
|
|
|
f58b3ab |
- libnm-util >= 0.8.1
|
|
|
f58b3ab |
- libnm-glib >= 0.8.1,
|
|
|
f58b3ab |
+ gnome-bluetooth-1.0 >= 2.27.6,
|
|
|
f58b3ab |
have_gbt=yes, have_gbt=no)
|
|
|
f58b3ab |
;;
|
|
|
f58b3ab |
esac
|
|
|
3b35b5a |
|
|
|
033b50a |
diff -up NetworkManager-0.8.1/network-manager-applet-0.8.1/src/connection-editor/Makefile.am.buildfix NetworkManager-0.8.1/network-manager-applet-0.8.1/src/connection-editor/Makefile.am
|
|
|
033b50a |
--- NetworkManager-0.8.1/network-manager-applet-0.8.1/src/connection-editor/Makefile.am.buildfix 2009-07-23 10:51:39.000000000 -0400
|
|
|
033b50a |
+++ NetworkManager-0.8.1/network-manager-applet-0.8.1/src/connection-editor/Makefile.am 2009-07-28 11:29:11.685841724 -0400
|
|
|
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 = \
|
|
|
1395c7d |
$(NMA_CFLAGS) \
|
|
|
1395c7d |
-DICONDIR=\""$(datadir)/icons"\" \
|
|
|
029921f |
@@ -63,7 +67,10 @@ nm_connection_editor_LDADD = \
|
|
|
5562f2d |
${top_builddir}/src/utils/libutils.la \
|
|
|
1395c7d |
${top_builddir}/src/marshallers/libmarshallers.la \
|
|
|
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 |
|
|
|
60d6eae |
gladedir = $(datadir)/nm-applet
|
|
|
60d6eae |
glade_DATA = \
|
|
|
033b50a |
diff -up NetworkManager-0.8.1/network-manager-applet-0.8.1/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.8.1/network-manager-applet-0.8.1/src/gconf-helpers/Makefile.am
|
|
|
033b50a |
--- NetworkManager-0.8.1/network-manager-applet-0.8.1/src/gconf-helpers/Makefile.am.buildfix 2009-04-20 07:09:10.000000000 -0400
|
|
|
033b50a |
+++ NetworkManager-0.8.1/network-manager-applet-0.8.1/src/gconf-helpers/Makefile.am 2009-07-28 11:29:11.686841642 -0400
|
|
|
798fed6 |
@@ -1,3 +1,7 @@
|
|
|
b6bef11 |
+INCLUDES = -I${top_srcdir}/../include \
|
|
|
b6bef11 |
+ -I${top_srcdir}/../libnm-util \
|
|
|
b6bef11 |
+ -I${top_srcdir}/../libnm-glib
|
|
|
b6bef11 |
+
|
|
|
b6bef11 |
noinst_LTLIBRARIES = libgconf-helpers.la
|
|
|
b6bef11 |
|
|
|
798fed6 |
libgconf_helpers_la_SOURCES = \
|
|
|
5562f2d |
@@ -19,5 +23,7 @@ libgconf_helpers_la_CPPFLAGS = \
|
|
|
f27fa1f |
libgconf_helpers_la_LIBADD = \
|
|
|
f27fa1f |
$(NMA_LIBS) \
|
|
|
818e4dc |
${top_builddir}/src/marshallers/libmarshallers.la \
|
|
|
f27fa1f |
- ${top_builddir}/src/utils/libutils.la
|
|
|
f27fa1f |
+ ${top_builddir}/src/utils/libutils.la \
|
|
|
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 |
|
|
|
033b50a |
diff -up NetworkManager-0.8.1/network-manager-applet-0.8.1/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.8.1/network-manager-applet-0.8.1/src/gnome-bluetooth/Makefile.am
|
|
|
033b50a |
--- NetworkManager-0.8.1/network-manager-applet-0.8.1/src/gnome-bluetooth/Makefile.am.buildfix 2009-07-28 13:23:40.282718683 -0400
|
|
|
033b50a |
+++ NetworkManager-0.8.1/network-manager-applet-0.8.1/src/gnome-bluetooth/Makefile.am 2009-07-28 13:24:56.316719077 -0400
|
|
|
fb480f3 |
@@ -6,6 +6,9 @@ INCLUDES = \
|
|
|
fb480f3 |
-I$(top_builddir) \
|
|
|
d80f4aa |
-I${top_builddir}/src/marshallers \
|
|
|
d80f4aa |
-I${top_srcdir}/src/utils \
|
|
|
fb480f3 |
+ -I${top_srcdir}/../include \
|
|
|
fb480f3 |
+ -I${top_srcdir}/../libnm-util \
|
|
|
fb480f3 |
+ -I${top_srcdir}/../libnm-glib \
|
|
|
fb480f3 |
$(GNOME_BLUETOOTH_CFLAGS) \
|
|
|
37a9b13 |
$(DISABLE_DEPRECATED) \
|
|
|
fb480f3 |
$(WARN_CFLAGS)
|
|
|
d80f4aa |
@@ -14,7 +17,9 @@ plugin_LTLIBRARIES = libnma.la
|
|
|
7f585d8 |
|
|
|
d80f4aa |
libnma_la_LIBADD = \
|
|
|
d80f4aa |
$(top_builddir)/src/gconf-helpers/libgconf-helpers.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 |
|
|
|
7ceb8a9 |
EXTRA_DIST = $(BT_WIDGET_SOURCES)
|
|
|
033b50a |
diff -up NetworkManager-0.8.1/network-manager-applet-0.8.1/src/Makefile.am.buildfix NetworkManager-0.8.1/network-manager-applet-0.8.1/src/Makefile.am
|
|
|
033b50a |
--- NetworkManager-0.8.1/network-manager-applet-0.8.1/src/Makefile.am.buildfix 2009-07-27 15:26:53.000000000 -0400
|
|
|
033b50a |
+++ NetworkManager-0.8.1/network-manager-applet-0.8.1/src/Makefile.am 2009-07-28 11:29:11.686841642 -0400
|
|
|
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 = \
|
|
|
5562f2d |
$(NMA_CFLAGS) \
|
|
|
5562f2d |
$(NOTIFY_CFLAGS) \
|
|
|
3b35b5a |
@@ -54,7 +58,9 @@ nm_applet_LDADD = \
|
|
|
5562f2d |
${top_builddir}/src/marshallers/libmarshallers.la \
|
|
|
5562f2d |
${top_builddir}/src/utils/libutils.la \
|
|
|
5562f2d |
${top_builddir}/src/gconf-helpers/libgconf-helpers.la \
|
|
|
5562f2d |
- ${top_builddir}/src/wireless-security/libwireless-security.la
|
|
|
5562f2d |
+ ${top_builddir}/src/wireless-security/libwireless-security.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 |
|
|
|
5562f2d |
gladedir = $(datadir)/nm-applet
|
|
|
5562f2d |
glade_DATA = applet.glade keyring.png
|
|
|
033b50a |
diff -up NetworkManager-0.8.1/network-manager-applet-0.8.1/src/utils/Makefile.am.buildfix NetworkManager-0.8.1/network-manager-applet-0.8.1/src/utils/Makefile.am
|
|
|
033b50a |
--- NetworkManager-0.8.1/network-manager-applet-0.8.1/src/utils/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
|
|
|
033b50a |
+++ NetworkManager-0.8.1/network-manager-applet-0.8.1/src/utils/Makefile.am 2009-07-28 11:29:11.686841642 -0400
|
|
|
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 = \
|
|
|
3b35b5a |
@@ -18,4 +22,7 @@ libutils_la_CPPFLAGS = \
|
|
|
87e85fc |
-I${top_srcdir}/src/gconf-helpers \
|
|
|
87e85fc |
-I${top_srcdir}/src
|
|
|
798fed6 |
|
|
|
798fed6 |
-libutils_la_LIBADD = $(NMA_LIBS)
|
|
|
798fed6 |
+libutils_la_LIBADD = $(NMA_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
|
|
|
798fed6 |
+
|
|
|
033b50a |
diff -up NetworkManager-0.8.1/network-manager-applet-0.8.1/src/utils/tests/Makefile.am.buildfix NetworkManager-0.8.1/network-manager-applet-0.8.1/src/utils/tests/Makefile.am
|
|
|
033b50a |
--- NetworkManager-0.8.1/network-manager-applet-0.8.1/src/utils/tests/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
|
|
|
033b50a |
+++ NetworkManager-0.8.1/network-manager-applet-0.8.1/src/utils/tests/Makefile.am 2009-07-28 11:29:11.686841642 -0400
|
|
|
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 |
|
|
|
033b50a |
diff -up NetworkManager-0.8.1/network-manager-applet-0.8.1/src/wireless-security/Makefile.am.buildfix NetworkManager-0.8.1/network-manager-applet-0.8.1/src/wireless-security/Makefile.am
|
|
|
033b50a |
--- NetworkManager-0.8.1/network-manager-applet-0.8.1/src/wireless-security/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
|
|
|
033b50a |
+++ NetworkManager-0.8.1/network-manager-applet-0.8.1/src/wireless-security/Makefile.am 2009-07-28 11:29:11.687841490 -0400
|
|
|
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 \
|
|
|
3b35b5a |
@@ -36,5 +40,7 @@ libwireless_security_la_CPPFLAGS = \
|
|
|
2ca88e3 |
libwireless_security_la_LIBADD = \
|
|
|
2ca88e3 |
$(NMA_LIBS) \
|
|
|
f27fa1f |
${top_builddir}/src/utils/libutils.la \
|
|
|
f27fa1f |
- ${top_builddir}/src/gconf-helpers/libgconf-helpers.la
|
|
|
f27fa1f |
+ ${top_builddir}/src/gconf-helpers/libgconf-helpers.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 |
|