Commit fc4fafb1 authored by Colin Walters's avatar Colin Walters

Initial commit

parents
This diff is collapsed.
<?xml version="1.0" encoding="UTF-8"?>
<Project xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
xmlns:foaf="http://xmlns.com/foaf/0.1/"
xmlns:gnome="http://api.gnome.org/doap-extensions#"
xmlns="http://usefulinc.com/ns/doap#">
<name>gnome-ostree</name>
<shortname>gnome-ostree</shortname>
<shortdesc xml:lang="en">GNOME OSTree manifest and patches</shortdesc>
<description xml:lang="en">GNOME OSTree manifest and patches</description>
<homepage rdf:resource="http://live.gnome.org/OSTree" />
<license rdf:resource="http://usefulinc.com/doap/licenses/lgpl" />
<mailing-list rdf:resource="mailto:ostree-list@gnome.org" />
<programming-language>C</programming-language>
<maintainer>
<foaf:Person>
<foaf:name>Colin Walters</foaf:name>
<foaf:mbox rdf:resource="mailto:walters@verbum.org"/>
<gnome:userid>walters</gnome:userid>
</foaf:Person>
</maintainer>
</Project>
This diff is collapsed.
From ae9072bbd4abfe3c0f7f419a5ab3e087dc4584b4 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Fri, 13 Jan 2012 20:29:37 -0500
Subject: [PATCH] build-sys: Fix some srcdir != builddir issues
* Look in the build directory for generated headers.
* Look in source directory for source files
* Also while we have the patient open, make some generation rules
atomic.
---
src/Makefile.am | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 869decd..322861a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,6 +9,7 @@ SUBDIRS = \
INCLUDES = \
-I. \
-I$(srcdir) \
+ -I$(builddir) \
$(CONSOLE_KIT_CFLAGS) \
$(POLKIT_CFLAGS) \
$(DISABLE_DEPRECATED_CFLAGS) \
@@ -83,19 +84,19 @@ dbusif_DATA = \
org.freedesktop.ConsoleKit.Session.xml \
$(NULL)
-ck-manager-glue.h: org.freedesktop.ConsoleKit.Manager.xml Makefile.am
- dbus-binding-tool --prefix=ck_manager --mode=glib-server --output=ck-manager-glue.h org.freedesktop.ConsoleKit.Manager.xml
-ck-seat-glue.h: org.freedesktop.ConsoleKit.Seat.xml Makefile.am
- dbus-binding-tool --prefix=ck_seat --mode=glib-server --output=ck-seat-glue.h org.freedesktop.ConsoleKit.Seat.xml
-ck-session-glue.h: org.freedesktop.ConsoleKit.Session.xml Makefile.am
- dbus-binding-tool --prefix=ck_session --mode=glib-server --output=ck-session-glue.h org.freedesktop.ConsoleKit.Session.xml
+ck-manager-glue.h: $(srcdir)/org.freedesktop.ConsoleKit.Manager.xml Makefile.am
+ dbus-binding-tool --prefix=ck_manager --mode=glib-server --output=ck-manager-glue.h $(srcdir)/org.freedesktop.ConsoleKit.Manager.xml
+ck-seat-glue.h: $(srcdir)/org.freedesktop.ConsoleKit.Seat.xml Makefile.am
+ dbus-binding-tool --prefix=ck_seat --mode=glib-server --output=ck-seat-glue.h $(srcdir)/org.freedesktop.ConsoleKit.Seat.xml
+ck-session-glue.h: $(srcdir)/org.freedesktop.ConsoleKit.Session.xml Makefile.am
+ dbus-binding-tool --prefix=ck_session --mode=glib-server --output=ck-session-glue.h $(srcdir)/org.freedesktop.ConsoleKit.Session.xml
ck-marshal.c: ck-marshal.list
echo "#include \"ck-marshal.h\"" > $@ && \
- @GLIB_GENMARSHAL@ $< --prefix=ck_marshal --body >> $@
+ @GLIB_GENMARSHAL@ $< --prefix=ck_marshal --body > $@.tmp && mv $@.tmp $@
ck-marshal.h: ck-marshal.list
- @GLIB_GENMARSHAL@ $< --prefix=ck_marshal --header > $@
+ @GLIB_GENMARSHAL@ $< --prefix=ck_marshal --header > $@.tmp && mv $@.tmp $@
console_kit_daemon_SOURCES = \
main.c \
--
1.7.6.4
From 3b12f65e888a69f74dee291344eb636997111222 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Wed, 22 Feb 2012 16:37:38 -0500
Subject: [PATCH] build: Fix srcdir != builddir for new generated headers
---
callouts/Makefile.am | 2 ++
callouts/tests/Makefile.am | 1 +
cli/src/Makefile.am | 1 +
examples/C/glib/Makefile.am | 1 +
libnm-glib/Makefile.am | 1 +
libnm-glib/tests/Makefile.am | 1 +
libnm-util/tests/Makefile.am | 3 ++-
src/Makefile.am | 2 ++
src/bluez-manager/Makefile.am | 2 ++
src/dhcp-manager/Makefile.am | 2 ++
src/dhcp-manager/tests/Makefile.am | 1 +
src/dns-manager/Makefile.am | 1 +
src/generated/Makefile.am | 1 +
src/ip6-manager/Makefile.am | 2 ++
src/modem-manager/Makefile.am | 4 +++-
src/ppp-manager/Makefile.am | 2 ++
src/settings/Makefile.am | 2 ++
src/settings/plugins/keyfile/Makefile.am | 3 ++-
src/settings/plugins/keyfile/tests/Makefile.am | 1 +
src/supplicant-manager/Makefile.am | 4 +++-
src/supplicant-manager/tests/Makefile.am | 1 +
src/tests/Makefile.am | 1 +
src/vpn-manager/Makefile.am | 2 ++
test/Makefile.am | 1 +
24 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/callouts/Makefile.am b/callouts/Makefile.am
index a3a2d26..6162785 100644
--- a/callouts/Makefile.am
+++ b/callouts/Makefile.am
@@ -60,6 +60,7 @@ nm_dispatcher_action_CPPFLAGS = \
-I${top_srcdir}/include \
-I${top_builddir}/include \
-I${top_srcdir}/libnm-util \
+ -I${top_builddir}/libnm-util \
$(DBUS_CFLAGS) \
$(GLIB_CFLAGS) \
-DG_DISABLE_DEPRECATED \
@@ -86,6 +87,7 @@ libtest_dispatcher_envp_la_CPPFLAGS = \
-I${top_srcdir}/include \
-I${top_builddir}/include \
-I${top_srcdir}/libnm-util \
+ -I${top_builddir}/libnm-util \
$(GLIB_CFLAGS) \
$(DBUS_CFLAGS)
diff --git a/callouts/tests/Makefile.am b/callouts/tests/Makefile.am
index 7121b92..93d3fae 100644
--- a/callouts/tests/Makefile.am
+++ b/callouts/tests/Makefile.am
@@ -2,6 +2,7 @@ INCLUDES = \
-I$(top_srcdir)/include \
-I${top_builddir}/include \
-I$(top_srcdir)/libnm-util \
+ -I$(top_builddir)/libnm-util \
-I$(top_srcdir)/callouts
noinst_PROGRAMS = \
diff --git a/cli/src/Makefile.am b/cli/src/Makefile.am
index 742bf0f..ec62bfe 100644
--- a/cli/src/Makefile.am
+++ b/cli/src/Makefile.am
@@ -6,6 +6,7 @@ INCLUDES = \
-I${top_srcdir}/include \
-I${top_builddir}/include \
-I${top_srcdir}/libnm-util \
+ -I${top_builddir}/libnm-util \
-I${top_srcdir}/libnm-glib
nmcli_SOURCES = \
diff --git a/examples/C/glib/Makefile.am b/examples/C/glib/Makefile.am
index a8821a9..428f6ad 100644
--- a/examples/C/glib/Makefile.am
+++ b/examples/C/glib/Makefile.am
@@ -1,4 +1,5 @@
INCLUDES = -I${top_srcdir}/libnm-util \
+ -I${top_builddir}/libnm-util \
-I${top_srcdir}/libnm-glib \
-I${top_srcdir}/include \
-I${top_builddir}/include
diff --git a/libnm-glib/Makefile.am b/libnm-glib/Makefile.am
index 0e9c0bd..5abd01a 100644
--- a/libnm-glib/Makefile.am
+++ b/libnm-glib/Makefile.am
@@ -6,6 +6,7 @@ INCLUDES = \
-I$(top_srcdir)/include \
-I$(top_builddir)/include \
-I$(top_srcdir)/libnm-util \
+ -I$(top_builddir)/libnm-util \
-I$(top_builddir)/marshallers
BUILT_SOURCES = \
diff --git a/libnm-glib/tests/Makefile.am b/libnm-glib/tests/Makefile.am
index 1564c59..0dba079 100644
--- a/libnm-glib/tests/Makefile.am
+++ b/libnm-glib/tests/Makefile.am
@@ -2,6 +2,7 @@ INCLUDES = \
-I$(top_srcdir)/include \
-I$(top_builddir)/include \
-I$(top_srcdir)/libnm-util \
+ -I$(top_builddir)/libnm-util \
-I$(top_srcdir)/libnm-glib
noinst_PROGRAMS = test-remote-settings-client
diff --git a/libnm-util/tests/Makefile.am b/libnm-util/tests/Makefile.am
index a3e12c3..46a4d14 100644
--- a/libnm-util/tests/Makefile.am
+++ b/libnm-util/tests/Makefile.am
@@ -3,7 +3,8 @@ SUBDIRS=certs
INCLUDES = \
-I$(top_srcdir)/include \
-I$(top_builddir)/include \
- -I$(top_srcdir)/libnm-util
+ -I$(top_srcdir)/libnm-util \
+ -I$(top_builddir)/libnm-util
noinst_PROGRAMS = \
test-settings-defaults \
diff --git a/src/Makefile.am b/src/Makefile.am
index 4112c73..c814e0a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,6 +24,7 @@ INCLUDES = -I${top_srcdir} \
-I${top_srcdir}/include \
-I${top_builddir}/include \
-I${top_srcdir}/src/generated \
+ -I${top_builddir}/src/generated \
-I${top_srcdir}/src/logging \
-I${top_srcdir}/src/dns-manager \
-I${top_srcdir}/src/vpn-manager \
@@ -36,6 +37,7 @@ INCLUDES = -I${top_srcdir} \
-I$(top_srcdir)/src/firewall-manager \
-I$(top_srcdir)/src/settings \
-I${top_srcdir}/libnm-util \
+ -I${top_builddir}/libnm-util \
-I${top_srcdir}/callouts
###########################################
diff --git a/src/bluez-manager/Makefile.am b/src/bluez-manager/Makefile.am
index 7bf00bd..10b32d2 100644
--- a/src/bluez-manager/Makefile.am
+++ b/src/bluez-manager/Makefile.am
@@ -3,8 +3,10 @@ INCLUDES = \
-I${top_srcdir}/include \
-I${top_builddir}/include \
-I${top_srcdir}/libnm-util \
+ -I${top_builddir}/libnm-util \
-I${top_srcdir}/src \
-I${top_srcdir}/src/generated \
+ -I${top_builddir}/src/generated \
-I${top_srcdir}/src/logging
noinst_LTLIBRARIES = libbluez-manager.la
diff --git a/src/dhcp-manager/Makefile.am b/src/dhcp-manager/Makefile.am
index fcea82e..ce34c41 100644
--- a/src/dhcp-manager/Makefile.am
+++ b/src/dhcp-manager/Makefile.am
@@ -5,8 +5,10 @@ INCLUDES = \
-I${top_srcdir}/include \
-I${top_builddir}/include \
-I${top_srcdir}/src/generated \
+ -I${top_builddir}/src/generated \
-I${top_srcdir}/src/logging \
-I${top_srcdir}/libnm-util \
+ -I${top_builddir}/libnm-util \
-I${top_srcdir}/src
noinst_LTLIBRARIES = libdhcp-manager.la libdhcp-dhclient.la
diff --git a/src/dhcp-manager/tests/Makefile.am b/src/dhcp-manager/tests/Makefile.am
index d1b3c84..1feade8 100644
--- a/src/dhcp-manager/tests/Makefile.am
+++ b/src/dhcp-manager/tests/Makefile.am
@@ -2,6 +2,7 @@ INCLUDES = \
-I$(top_srcdir)/include \
-I$(top_builddir)/include \
-I${top_srcdir}/libnm-util \
+ -I${top_builddir}/libnm-util \
-I$(top_srcdir)/src/dhcp-manager
noinst_PROGRAMS = test-dhcp-dhclient
diff --git a/src/dns-manager/Makefile.am b/src/dns-manager/Makefile.am
index def8fe6..331f85c 100644
--- a/src/dns-manager/Makefile.am
+++ b/src/dns-manager/Makefile.am
@@ -1,6 +1,7 @@
INCLUDES = \
-I${top_srcdir}/src/logging \
-I${top_srcdir}/libnm-util \
+ -I${top_builddir}/libnm-util \
-I${top_srcdir}/src \
-I${top_srcdir}/include \
-I${top_builddir}/include
diff --git a/src/generated/Makefile.am b/src/generated/Makefile.am
index 29e1525..83c867a 100644
--- a/src/generated/Makefile.am
+++ b/src/generated/Makefile.am
@@ -41,6 +41,7 @@ nm_marshal_sources = $(nm_daemon_sources)
INCLUDES = \
-I${top_srcdir}/include \
+ -I${top_builddir}/include \
-I${top_srcdir}/src \
-I${top_srcdir}/src/logging \
-I${top_srcdir}/src/dns-manager \
diff --git a/src/ip6-manager/Makefile.am b/src/ip6-manager/Makefile.am
index fd3e929..016fc25 100644
--- a/src/ip6-manager/Makefile.am
+++ b/src/ip6-manager/Makefile.am
@@ -3,7 +3,9 @@ INCLUDES = \
-I${top_srcdir}/include \
-I${top_builddir}/include \
-I${top_srcdir}/libnm-util \
+ -I${top_builddir}/libnm-util \
-I${top_srcdir}/src/generated \
+ -I${top_builddir}/src/generated \
-I${top_srcdir}/src/logging \
-I${top_srcdir}/src
diff --git a/src/modem-manager/Makefile.am b/src/modem-manager/Makefile.am
index ad83e03..a5c6a66 100644
--- a/src/modem-manager/Makefile.am
+++ b/src/modem-manager/Makefile.am
@@ -3,10 +3,12 @@ include $(GLIB_MAKEFILE)
INCLUDES = \
-I${top_srcdir}/src \
-I${top_srcdir}/src/generated \
+ -I${top_builddir}/src/generated \
-I${top_srcdir}/src/logging \
-I${top_srcdir}/include \
-I${top_builddir}/include \
- -I${top_srcdir}/libnm-util
+ -I${top_srcdir}/libnm-util \
+ -I${top_builddir}/libnm-util
noinst_LTLIBRARIES = libmodem-manager.la
diff --git a/src/ppp-manager/Makefile.am b/src/ppp-manager/Makefile.am
index 6eb77ef..8df2f58 100644
--- a/src/ppp-manager/Makefile.am
+++ b/src/ppp-manager/Makefile.am
@@ -3,8 +3,10 @@ INCLUDES = \
-I${top_srcdir}/include \
-I${top_builddir}/include \
-I${top_srcdir}/libnm-util \
+ -I${top_builddir}/libnm-util \
-I${top_srcdir}/src \
-I${top_srcdir}/src/generated \
+ -I${top_builddir}/src/generated \
-I${top_srcdir}/src/logging
noinst_LTLIBRARIES = libppp-manager.la
diff --git a/src/settings/Makefile.am b/src/settings/Makefile.am
index 8094ac1..8024d54 100644
--- a/src/settings/Makefile.am
+++ b/src/settings/Makefile.am
@@ -4,7 +4,9 @@ INCLUDES = -I${top_srcdir} \
-I${top_srcdir}/include \
-I${top_builddir}/include \
-I${top_srcdir}/libnm-util \
+ -I${top_builddir}/libnm-util \
-I${top_srcdir}/src/generated \
+ -I${top_builddir}/src/generated \
-I${top_srcdir}/src/logging \
-I${top_srcdir}/src
diff --git a/src/settings/plugins/keyfile/Makefile.am b/src/settings/plugins/keyfile/Makefile.am
index e074873..e6af222 100644
--- a/src/settings/plugins/keyfile/Makefile.am
+++ b/src/settings/plugins/keyfile/Makefile.am
@@ -4,7 +4,8 @@ INCLUDES = \
-I$(top_srcdir)/src/settings \
-I$(top_srcdir)/include \
-I$(top_builddir)/include \
- -I$(top_srcdir)/libnm-util
+ -I$(top_srcdir)/libnm-util \
+ -I$(top_builddir)/libnm-util
noinst_LTLIBRARIES = \
libkeyfile-io.la \
diff --git a/src/settings/plugins/keyfile/tests/Makefile.am b/src/settings/plugins/keyfile/tests/Makefile.am
index 90bc233..2adbf87 100644
--- a/src/settings/plugins/keyfile/tests/Makefile.am
+++ b/src/settings/plugins/keyfile/tests/Makefile.am
@@ -4,6 +4,7 @@ INCLUDES = \
-I$(top_srcdir)/include \
-I$(top_builddir)/include \
-I$(top_srcdir)/libnm-util \
+ -I$(top_builddir)/libnm-util \
-I$(top_srcdir)/libnm-glib \
-I$(srcdir)/../
diff --git a/src/supplicant-manager/Makefile.am b/src/supplicant-manager/Makefile.am
index 1c887b1..e8a2ce7 100644
--- a/src/supplicant-manager/Makefile.am
+++ b/src/supplicant-manager/Makefile.am
@@ -3,10 +3,12 @@ SUBDIRS=. tests
INCLUDES = \
-I${top_srcdir}/src \
-I${top_srcdir}/src/generated \
+ -I${top_builddir}/src/generated \
-I${top_srcdir}/src/logging \
-I${top_srcdir}/include \
-I${top_builddir}/include \
- -I${top_srcdir}/libnm-util
+ -I${top_srcdir}/libnm-util \
+ -I${top_builddir}/libnm-util
noinst_LTLIBRARIES = libsupplicant-manager.la
diff --git a/src/supplicant-manager/tests/Makefile.am b/src/supplicant-manager/tests/Makefile.am
index b236025..47ae66c 100644
--- a/src/supplicant-manager/tests/Makefile.am
+++ b/src/supplicant-manager/tests/Makefile.am
@@ -2,6 +2,7 @@ INCLUDES = \
-I$(top_srcdir)/include \
-I$(top_builddir)/include \
-I$(top_srcdir)/libnm-util \
+ -I$(top_builddir)/libnm-util \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/supplicant-manager
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 38a8d22..9048704 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -2,6 +2,7 @@ INCLUDES = \
-I$(top_srcdir)/include \
-I$(top_builddir)/include \
-I$(top_srcdir)/libnm-util \
+ -I$(top_builddir)/libnm-util \
-I$(top_srcdir)/src/dhcp-manager \
-I$(top_builddir)/marshallers \
-I$(top_srcdir)/src \
diff --git a/src/vpn-manager/Makefile.am b/src/vpn-manager/Makefile.am
index fdc4c89..c3c5b52 100644
--- a/src/vpn-manager/Makefile.am
+++ b/src/vpn-manager/Makefile.am
@@ -3,7 +3,9 @@ INCLUDES = \
-I${top_srcdir}/include \
-I${top_builddir}/include \
-I${top_srcdir}/libnm-util \
+ -I${top_builddir}/libnm-util \
-I${top_srcdir}/src/generated \
+ -I${top_builddir}/src/generated \
-I${top_srcdir}/src/logging \
-I${top_srcdir}/src \
-I${top_srcdir}/src/dns-manager \
diff --git a/test/Makefile.am b/test/Makefile.am
index 952f8e7..b628536 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,5 +1,6 @@
INCLUDES = -I${top_srcdir} \
-I${top_srcdir}/libnm-util \
+ -I${top_builddir}/libnm-util \
-I${top_srcdir}/libnm-glib \
-I${top_srcdir}/include \
-I${top_builddir}/include
--
1.7.6.5
From 7a8b9a75a0bd75d7548b428ee46ee16f296e45f7 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Thu, 12 Jan 2012 09:50:57 -0500
Subject: [PATCH] keyfile: Install default config file if we're TARGET_GENERIC
NetworkManager just segfaults on startup if there's no
/etc/NetworkManager/NetworkManager.conf, if we're TARGET_GENERIC, then
we are only using keyfiles, so install a basic config file.
---
src/settings/plugins/keyfile/Makefile.am | 10 +++++++++-
.../plugins/keyfile/NetworkManager-keyfile.conf | 2 ++
2 files changed, 11 insertions(+), 1 deletions(-)
create mode 100644 src/settings/plugins/keyfile/NetworkManager-keyfile.conf
diff --git a/src/settings/plugins/keyfile/Makefile.am b/src/settings/plugins/keyfile/Makefile.am
index e941e9b..e074873 100644
--- a/src/settings/plugins/keyfile/Makefile.am
+++ b/src/settings/plugins/keyfile/Makefile.am
@@ -57,6 +57,14 @@ libnm_settings_plugin_keyfile_la_LDFLAGS = -rdynamic
keyfiledir=$(sysconfdir)/NetworkManager/system-connections
+if TARGET_GENERIC
+install_keyfile_conf=true
+else
+install_keyfile_conf=false
+endif
+
install-data-hook:
$(mkinstalldirs) -m 0755 $(DESTDIR)$(keyfiledir)
-
+ if $(install_keyfile_conf); then \
+ install -m 0644 $(srcdir)/NetworkManager-keyfile.conf $(DESTDIR)/$(sysconfdir)/NetworkManager/NetworkManager.conf; \
+ fi
diff --git a/src/settings/plugins/keyfile/NetworkManager-keyfile.conf b/src/settings/plugins/keyfile/NetworkManager-keyfile.conf
new file mode 100644
index 0000000..c37b596
--- /dev/null
+++ b/src/settings/plugins/keyfile/NetworkManager-keyfile.conf
@@ -0,0 +1,2 @@
+[main]
+plugins=keyfile
--
1.7.6.4
From 0da5b6f2404f8abeb542207aeea23820687e60e4 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Sun, 8 Jan 2012 14:13:23 -0500
Subject: [PATCH] configure: Add --with-distro=generic
For now we'll just get a basic NM setup for GNOME.
---
configure.ac | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/configure.ac b/configure.ac
index 7cb5dc0..955e2e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -132,7 +132,7 @@ if test "z$with_distro" = "z"; then
exit 1
else
case $with_distro in
- redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva|pardus|linexa|exherbo) ;;
+ redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva|pardus|linexa|exherbo|generic) ;;
*)
echo "Your distribution (${with_distro}) is not yet supported! (patches welcome)"
exit 1
--
1.7.6.4
From 96c2bf715e2bc0912433c4ddbe65f76a0a1dba6f Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Sun, 29 Jan 2012 16:01:56 -0500
Subject: [PATCH] build: Allow --set-more-warnings=no|yes|error
For the GNOME autobuilders, we want compiler warnings, but don't want
-Werror. For developer compatibility, the default value is "error".
---
m4/compiler_warnings.m4 | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/m4/compiler_warnings.m4 b/m4/compiler_warnings.m4
index 575ea9a..eeacfae 100644
--- a/m4/compiler_warnings.m4
+++ b/m4/compiler_warnings.m4
@@ -1,7 +1,7 @@
AC_DEFUN([NM_COMPILER_WARNINGS],
[AC_ARG_ENABLE(more-warnings,
- AS_HELP_STRING([--enable-more-warnings], [Maximum compiler warnings]),
- set_more_warnings="$enableval",set_more_warnings=yes)
+ AS_HELP_STRING([--enable-more-warnings], [Possible values: no/yes/error]),
+ set_more_warnings="$enableval",set_more_warnings=error)
AC_MSG_CHECKING(for more warnings)
if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
AC_MSG_RESULT(yes)
@@ -26,7 +26,9 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
unset SAVE_CFLAGS
done
unset option
- CFLAGS="$CFLAGS -Werror"
+ if test "x$set_more_warnings" = xerror; then
+ CFLAGS="$CFLAGS -Werror"
+ fi
else
AC_MSG_RESULT(no)
fi
--
1.7.6.5
From 984263b474387ca4c688f2c830fb3dea16da3ff3 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Sun, 29 Jan 2012 16:22:51 -0500
Subject: [PATCH] autogen.sh: Fix check for libtool (we only need libtoolize)
A pre-built libtool copy may not be installed on all systems; all
we need is libtoolize.
---
autogen.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index 426e875..d08b00a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -26,7 +26,7 @@ touch ChangeLog
}
(grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null) && {
- (libtool --version) < /dev/null > /dev/null 2>&1 || {
+ (libtoolize --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "**Error**: You must have libtool installed."
echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
--
1.7.6.5
From 6dae71d03594b8bcd95195c6c167b4b3ff6780fa Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Wed, 18 Jan 2012 16:32:48 -0500
Subject: [PATCH] autogen.sh: Honor NOCONFIGURE=1
See http://people.gnome.org/~walters/docs/build-api.txt
---
autogen.sh | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index bb7779d..029d737 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -20,4 +20,6 @@ autoreconf --verbose --install -I Source/autotools $ACLOCAL_FLAGS|| exit $?
cd $ORIGDIR || exit 1
-$srcdir/configure $AUTOGEN_CONFIGURE_ARGS "$@" || exit $?
+if test -z "$NOCONFIGURE"; then
+ exec $srcdir/configure $AUTOGEN_CONFIGURE_ARGS "$@"
+fi
--
1.7.6.5
From e866eaadcfe11f36265de4f9088a6958b9d64753 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Wed, 22 Feb 2012 22:50:51 -0500
Subject: [PATCH] libaccountsservice: Fix srcdir != builddir for generated
files
---
src/libaccountsservice/Makefile.am | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/libaccountsservice/Makefile.am b/src/libaccountsservice/Makefile.am
index 922464a..0bce6a4 100644
--- a/src/libaccountsservice/Makefile.am
+++ b/src/libaccountsservice/Makefile.am
@@ -42,13 +42,13 @@ accounts-user-generated.c accounts-user-generated.h: $(top_srcdir)/data/org.free
gdbus-codegen --generate-c-code accounts-user-generated --c-namespace Accounts --interface-prefix=org.freedesktop.Accounts. $(top_srcdir)/data/org.freedesktop.Accounts.User.xml
ck-manager-generated.c ck-manager-generated.h: org.freedesktop.ConsoleKit.Manager.xml Makefile
- gdbus-codegen --generate-c-code ck-manager-generated --c-namespace ConsoleKit --interface-prefix=org.freedesktop.ConsoleKit org.freedesktop.ConsoleKit.Manager.xml
+ gdbus-codegen --generate-c-code ck-manager-generated --c-namespace ConsoleKit --interface-prefix=org.freedesktop.ConsoleKit $(srcdir)/org.freedesktop.ConsoleKit.Manager.xml
ck-seat-generated.c ck-seat-generated.h: org.freedesktop.ConsoleKit.Seat.xml Makefile
- gdbus-codegen --generate-c-code ck-seat-generated --c-namespace ConsoleKit --interface-prefix=org.freedesktop.ConsoleKit org.freedesktop.ConsoleKit.Seat.xml
+ gdbus-codegen --generate-c-code ck-seat-generated --c-namespace ConsoleKit --interface-prefix=org.freedesktop.ConsoleKit $(srcdir)/org.freedesktop.ConsoleKit.Seat.xml
ck-session-generated.c ck-session-generated.h: org.freedesktop.ConsoleKit.Session.xml Makefile
- gdbus-codegen --generate-c-code ck-session-generated --c-namespace ConsoleKit --interface-prefix=org.freedesktop.ConsoleKit org.freedesktop.ConsoleKit.Session.xml
+ gdbus-codegen --generate-c-code ck-session-generated --c-namespace ConsoleKit --interface-prefix=org.freedesktop.ConsoleKit $(srcdir)/org.freedesktop.ConsoleKit.Session.xml
BUILT_SOURCES += \
accounts-generated.c \
--
1.7.6.5
From b525b062317d3174c8fa802302a498beb7d8d111 Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@fedoraproject.org>
Date: Fri, 13 Jan 2012 15:49:46 -0500
Subject: [PATCH] build: Support makeinstall DESTDIR=
Signed-off-by: Colin Walters <walters@verbum.org>
---
include/builddefs.in | 16 ++++++++--------
include/buildmacros | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/include/builddefs.in b/include/builddefs.in
index d054a56..10b0cd4 100644
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -28,14 +28,14 @@ PKG_RELEASE = @pkg_release@
PKG_VERSION = @pkg_version@
PKG_PLATFORM = @pkg_platform@
PKG_DISTRIBUTION= @pkg_distribution@
-PKG_BIN_DIR = @bindir@
-PKG_SBIN_DIR = @sbindir@
-PKG_LIB_DIR = @libdir@@libdirsuffix@
-PKG_DEVLIB_DIR = @libexecdir@@libdirsuffix@
-PKG_INC_DIR = @includedir@
-PKG_MAN_DIR = @mandir@
-PKG_DOC_DIR = @datadir@/doc/@pkg_name@
-PKG_LOCALE_DIR = @datadir@/locale
+PKG_BIN_DIR = $(DESTDIR)@bindir@
+PKG_SBIN_DIR = $(DESTDIR)@sbindir@
+PKG_LIB_DIR = $(DESTDIR)@libdir@@libdirsuffix@
+PKG_DEVLIB_DIR = $(DESTDIR)@libexecdir@@libdirsuffix@
+PKG_INC_DIR = $(DESTDIR)@includedir@
+PKG_MAN_DIR = $(DESTDIR)@mandir@
+PKG_DOC_DIR = $(DESTDIR)@datadir@/doc/@pkg_name@-@pkg_version@
+PKG_LOCALE_DIR = $(DESTDIR)@datadir@/locale
CC = @cc@
AWK = @awk@
diff --git a/include/buildmacros b/include/buildmacros
index ab89182..9c4fd50 100644
--- a/include/buildmacros
+++ b/include/buildmacros
@@ -40,7 +40,7 @@ OBJECTS = $(ASFILES:.s=.o) \
$(LFILES:.l=.o) \
$(YFILES:%.y=%.tab.o)
-INSTALL = $(TOPDIR)/include/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
+INSTALL = $(TOPDIR)/include/install-sh
SHELL = /bin/sh
IMAGES_DIR = $(TOPDIR)/all-images
--
1.7.6.4
From 41c1c78f462aa8bd254c28de0d6dd0b68c6f6571 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>