colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2007-06-11 Christopher Aillon <caillon@redhat.com>

Browse Source 
Patch from Christian Persch <chpe@gnome.org>

	* libnm-glib/Makefile.am:
	* dispatcher-daemon/Makefile.am:
	Use the correct variables, the correct paths, and correct ordering. (446315)


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2588 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Christopher Aillon
2007-06-12 03:02:38 +00:00
committed by Chris Aillon
parent 9d1808c4e5
commit 9caa66c446
3 changed files with 38 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -1,3 +1,11 @@
2007-06-11 Christopher Aillon <caillon@redhat.com>
Patch from Christian Persch <chpe@gnome.org>
* libnm-glib/Makefile.am:
* dispatcher-daemon/Makefile.am:
Use the correct variables, the correct paths, and correct ordering. (446315)
2007-06-11 Tambet Ingo <tambet@ximian.com> 2007-06-11 Tambet Ingo <tambet@ximian.com>
* src/nm-device.c: Make the activation stage virtual functions take NMDevice * src/nm-device.c: Make the activation stage virtual functions take NMDevice

28
dispatcher-daemon/Makefile.am
View File

@@ -1,14 +1,17 @@
INCLUDES = -I${top_srcdir} -I${top_srcdir}/utils -I${top_srcdir}/include -I$(top_srcdir)/libnm-glib -I$(top_srcdir)/libnm-util
NULL= NULL=
sbin_PROGRAMS = NetworkManagerDispatcher sbin_PROGRAMS = NetworkManagerDispatcher
NetworkManagerDispatcher_SOURCES = \
NetworkManagerDispatcher.c \
$(NULL)
NetworkManagerDispatcher_CPPFLAGS = \ NetworkManagerDispatcher_CPPFLAGS = \
$(DBUS_CFLAGS) \ -I$(top_srcdir) \
$(GTHREAD_CFLAGS) \ -I$(top_srcdir)/utils \
-Wall \ -I$(top_srcdir)/include \
-I$(top_srcdir)/libnm-util \
-I$(top_srcdir)/libnm-glib \
-DDBUS_API_SUBJECT_TO_CHANGE \ -DDBUS_API_SUBJECT_TO_CHANGE \
-DBINDIR=\"$(bindir)\" \ -DBINDIR=\"$(bindir)\" \
-DDATADIR=\"$(datadir)\" \ -DDATADIR=\"$(datadir)\" \
@@ -16,11 +19,16 @@ NetworkManagerDispatcher_CPPFLAGS = \
-DLOCALSTATEDIR=\"$(localstatedir)\" \ -DLOCALSTATEDIR=\"$(localstatedir)\" \
$(NULL) $(NULL)
NetworkManagerDispatcher_SOURCES = NetworkManagerDispatcher.c NetworkManagerDispatcher_CFLAGS = \
$(DBUS_CFLAGS) \
$(GTHREAD_CFLAGS) \
-Wall \
$(NULL)
NetworkManagerDispatcher_LDADD = \ NetworkManagerDispatcher_LDADD = \
$(top_builddir)/utils/libnmutils.la \
$(top_builddir)/libnm-util/libnm-util.la\
$(top_builddir)/libnm-glib/libnm-glib.la\
$(DBUS_LIBS) \ $(DBUS_LIBS) \
$(GTHREAD_LIBS) \ $(GTHREAD_LIBS) \
$(top_builddir)/utils/libnmutils.la \ $(NULL)
$(top_builddir)/libnm-glib/libnm-glib.la

12
libnm-glib/Makefile.am
View File

@@ -11,7 +11,7 @@ BUILT_SOURCES = \
lib_LTLIBRARIES = libnm-glib.la lib_LTLIBRARIES = libnm-glib.la
libnm_glib_la_CPPFLAGS = \ libnm_glib_la_CFLAGS = \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
$(DBUS_CFLAGS) $(DBUS_CFLAGS)
@@ -39,14 +39,16 @@ libnm_glib_la_SOURCES = \
nm-vpn-connection.c \ nm-vpn-connection.c \
nm-marshal-main.c nm-marshal-main.c
libnm_glib_la_LDFLAGS = $(GLIB_LIBS) $(DBUS_LIBS) $(top_srcdir)/libnm-util/libnm-util.la libnm_glib_la_LIBADD = \
$(top_builddir)/libnm-util/libnm-util.la \
$(GLIB_LIBS) \
$(DBUS_LIBS)
noinst_PROGRAMS = libnm-glib-test noinst_PROGRAMS = libnm-glib-test
AM_CPPFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS)
libnm_glib_test_SOURCES = libnm-glib-test.c libnm_glib_test_SOURCES = libnm-glib-test.c
libnm_glib_test_LDADD = $(GLIB_LIBS) $(DBUS_LIBS) $(top_builddir)/libnm-glib/libnm-glib.la libnm_glib_test_CFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS)
libnm_glib_test_LDADD = libnm-glib.la $(top_builddir)/libnm-util/libnm-util.la $(GLIB_LIBS) $(DBUS_LIBS)
nm-marshal.h: Makefile.am nm-marshal.list nm-marshal.h: Makefile.am nm-marshal.list
$(GLIB_GENMARSHAL) --prefix=nm_marshal $(srcdir)/nm-marshal.list --header > \ $(GLIB_GENMARSHAL) --prefix=nm_marshal $(srcdir)/nm-marshal.list --header > \