|
 |
b6bef11 |
diff -up NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac
|
|
|
798fed6 |
--- NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix 2007-11-13 09:53:39.000000000 -0500
|
|
|
798fed6 |
+++ NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac 2007-11-13 15:14:13.000000000 -0500
|
|
|
798fed6 |
@@ -60,9 +60,6 @@ AC_C_BIGENDIAN
|
|
|
a03c871 |
PKG_CHECK_MODULES(NMA,
|
|
|
a03c871 |
[dbus-glib-1 >= 0.72
|
|
|
a03c871 |
glib-2.0 >= 2.10
|
|
|
a03c871 |
- NetworkManager >= 0.7.0
|
|
|
bec76ac |
- libnm_glib
|
|
|
798fed6 |
- libnm-util
|
|
|
30562d5 |
gtk+-2.0 >= 2.10
|
|
|
a03c871 |
libglade-2.0
|
|
|
c2e0e4e |
gconf-2.0
|
|
|
ecd626d |
diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/vpn-properties/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/vpn-properties/Makefile.am
|
|
|
2ca88e3 |
--- NetworkManager-0.7.0/nm-applet-0.7.0/src/vpn-properties/Makefile.am.buildfix 2007-09-22 22:54:27.000000000 -0400
|
|
|
798fed6 |
+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/vpn-properties/Makefile.am 2007-11-13 15:14:13.000000000 -0500
|
|
|
ecd626d |
@@ -1,6 +1,10 @@
|
|
|
ecd626d |
|
|
|
ecd626d |
bin_PROGRAMS = nm-vpn-properties
|
|
|
ecd626d |
|
|
|
ecd626d |
+INCLUDES = -I${top_srcdir}/../include \
|
|
|
ecd626d |
+ -I${top_srcdir}/../libnm-util \
|
|
|
ecd626d |
+ -I${top_srcdir}/../libnm-glib
|
|
|
ecd626d |
+
|
|
|
ecd626d |
nm_vpn_propertiesdir=$(includedir)/NetworkManager
|
|
|
ecd626d |
|
|
|
ecd626d |
nm_vpn_properties_HEADERS = \
|
|
|
ecd626d |
@@ -28,7 +32,9 @@ nm_vpn_properties_CFLAGS = \
|
|
|
ecd626d |
|
|
|
ecd626d |
nm_vpn_properties_LDADD = \
|
|
|
ecd626d |
$(NMA_LIBS) \
|
|
|
ecd626d |
- ${top_builddir}/src/gconf-helpers/libgconf-helpers.la
|
|
|
ecd626d |
+ ${top_builddir}/src/gconf-helpers/libgconf-helpers.la \
|
|
|
ecd626d |
+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
|
|
|
ecd626d |
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
|
|
|
ecd626d |
|
|
|
ecd626d |
CLEANFILES = $(server_DATA) *.bak *.gladep *~
|
|
|
ecd626d |
|
|
|
b6bef11 |
diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am
|
|
|
798fed6 |
--- NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix 2007-10-27 18:23:56.000000000 -0400
|
|
|
798fed6 |
+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am 2007-11-13 15:14:13.000000000 -0500
|
|
|
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 = \
|
|
|
f27fa1f |
@@ -13,5 +17,7 @@ libgconf_helpers_la_CPPFLAGS = \
|
|
|
b6bef11 |
|
|
|
f27fa1f |
libgconf_helpers_la_LIBADD = \
|
|
|
f27fa1f |
$(NMA_LIBS) \
|
|
|
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 \
|
|
|
b6bef11 |
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
|
|
|
b6bef11 |
|
|
|
798fed6 |
diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am
|
|
|
798fed6 |
--- NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am.buildfix 2007-11-13 15:41:01.000000000 -0500
|
|
|
798fed6 |
+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am 2007-11-13 15:42:30.000000000 -0500
|
|
|
798fed6 |
@@ -1,3 +1,7 @@
|
|
|
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 = \
|
|
|
798fed6 |
@@ -10,7 +14,9 @@ libutils_la_SOURCES = \
|
|
|
798fed6 |
|
|
|
798fed6 |
libutils_la_CPPFLAGS = $(NMA_CFLAGS)
|
|
|
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 \
|
|
|
798fed6 |
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
|
|
|
798fed6 |
|
|
|
798fed6 |
if WITH_GNUTLS
|
|
|
798fed6 |
libutils_la_SOURCES += crypto_gnutls.c
|
|
|
798fed6 |
@@ -28,4 +34,7 @@ noinst_PROGRAMS = test-crypto
|
|
|
798fed6 |
|
|
|
798fed6 |
test_crypto_SOURCES = test-crypto.c
|
|
|
798fed6 |
test_crypto_CPPFLAGS = $(NMA_CFLAGS) -D_GNU_SOURCE
|
|
|
798fed6 |
-test_crypto_LDADD = $(NMA_LIBS) ${top_builddir}/src/utils/libutils.la
|
|
|
798fed6 |
+test_crypto_LDADD = $(NMA_LIBS) ${top_builddir}/src/utils/libutils.la \
|
|
|
798fed6 |
+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
|
|
|
798fed6 |
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
|
|
|
798fed6 |
+
|
|
|
2ca88e3 |
diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am
|
|
|
798fed6 |
--- NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am.buildfix 2007-11-07 12:12:16.000000000 -0500
|
|
|
798fed6 |
+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am 2007-11-13 15:14:13.000000000 -0500
|
|
|
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 \
|
|
|
f27fa1f |
@@ -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 \
|
|
|
2ca88e3 |
+ -L${top_srcdir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
|
|
|
2ca88e3 |
|
|
|
b6bef11 |
diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am
|
|
|
b6bef11 |
--- NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix 2007-09-20 07:40:37.000000000 -0400
|
|
|
798fed6 |
+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am 2007-11-13 15:14:13.000000000 -0500
|
|
|
b6bef11 |
@@ -2,6 +2,10 @@ NULL=
|
|
|
b6bef11 |
|
|
|
b6bef11 |
bin_PROGRAMS = nm-connection-editor
|
|
|
b6bef11 |
|
|
|
b6bef11 |
+INCLUDES = -I${top_srcdir}/../include \
|
|
|
b6bef11 |
+ -I${top_srcdir}/../libnm-util \
|
|
|
b6bef11 |
+ -I${top_srcdir}/../libnm-glib
|
|
|
b6bef11 |
+
|
|
|
b6bef11 |
nm_connection_editor_CPPFLAGS = \
|
|
|
b6bef11 |
$(NMA_CFLAGS) \
|
|
|
b6bef11 |
-DICONDIR=\""$(datadir)/icons"\" \
|
|
|
f7bb7f5 |
@@ -29,7 +33,9 @@ nm_connection_editor_LDADD = \
|
|
|
f7bb7f5 |
$(top_builddir)/src/gconf-helpers/libgconf-helpers.la \
|
|
|
f7bb7f5 |
${top_builddir}/src/wireless-security/libwireless-security.la \
|
|
|
f7bb7f5 |
${top_builddir}/src/utils/libutils.la \
|
|
|
f7bb7f5 |
- $(NMA_LIBS)
|
|
|
f7bb7f5 |
+ $(NMA_LIBS) \
|
|
|
b6bef11 |
+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
|
|
|
f7bb7f5 |
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
|
|
|
b6bef11 |
|
|
|
b6bef11 |
gladedir = $(datadir)/nm-applet
|
|
|
f7bb7f5 |
glade_DATA = nm-connection-editor.gladediff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am
|
|
|
798fed6 |
--- NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix 2007-10-27 18:11:31.000000000 -0400
|
|
|
798fed6 |
+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am 2007-11-13 15:14:13.000000000 -0500
|
|
|
a03c871 |
@@ -4,6 +4,10 @@ NULL=
|
|
|
55a16fd |
|
|
|
a03c871 |
bin_PROGRAMS = nm-applet
|
|
|
a03c871 |
|
|
|
a03c871 |
+INCLUDES = -I${top_srcdir}/../include \
|
|
|
a03c871 |
+ -I${top_srcdir}/../libnm-util \
|
|
|
a03c871 |
+ -I${top_srcdir}/../libnm-glib
|
|
|
a03c871 |
+
|
|
|
30562d5 |
nm_applet_CPPFLAGS = \
|
|
|
30562d5 |
$(NMA_CFLAGS) \
|
|
|
c2e0e4e |
-DICONDIR=\""$(datadir)/icons"\" \
|
|
|
798fed6 |
@@ -58,7 +62,9 @@ nm_applet_LDADD = \
|
|
|
c2e0e4e |
$(NMA_LIBS) \
|
|
|
2ca88e3 |
${top_builddir}/src/utils/libutils.la \
|
|
|
2ca88e3 |
${top_builddir}/src/gconf-helpers/libgconf-helpers.la \
|
|
|
2ca88e3 |
- ${top_builddir}/src/wireless-security/libwireless-security.la
|
|
|
2ca88e3 |
+ ${top_builddir}/src/wireless-security/libwireless-security.la \
|
|
|
a03c871 |
+ -L${top_srcdir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
|
|
|
a03c871 |
+ -L${top_srcdir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
|
|
|
a03c871 |
|
|
|
c2e0e4e |
if WITH_NOTIFY
|
|
|
c2e0e4e |
nm_applet_LDADD += $(NOTIFY_LIBS)
|
|
|
d02fe96 |
|