[gnome-initial-setup] Fix distcheck
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-initial-setup] Fix distcheck
- Date: Tue, 20 Nov 2012 01:08:13 +0000 (UTC)
commit a322f4a937076e96b97e701146d31bdc60a2b87c
Author: Matthias Clasen <mclasen redhat com>
Date: Mon Nov 19 20:08:19 2012 -0500
Fix distcheck
...and hopefully srcdir != builddir builds in general.
gnome-initial-setup/gnome-initial-setup.c | 2 +-
gnome-initial-setup/pages/language/Makefile.am | 5 ++++-
.../pages/language/gis-language-page.c | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/gnome-initial-setup/gnome-initial-setup.c b/gnome-initial-setup/gnome-initial-setup.c
index 1a98e91..cc2769b 100644
--- a/gnome-initial-setup/gnome-initial-setup.c
+++ b/gnome-initial-setup/gnome-initial-setup.c
@@ -35,7 +35,7 @@
#include <cheese-gtk.h>
#endif
-#include <egg-list-box/egg-list-box.h>
+#include <egg-list-box.h>
#include "pages/language/gis-language-page.h"
#include "pages/eulas/gis-eula-pages.h"
diff --git a/gnome-initial-setup/pages/language/Makefile.am b/gnome-initial-setup/pages/language/Makefile.am
index 5ca47f8..5095c76 100644
--- a/gnome-initial-setup/pages/language/Makefile.am
+++ b/gnome-initial-setup/pages/language/Makefile.am
@@ -2,6 +2,9 @@
noinst_LTLIBRARIES = libgislanguage.la
AM_CPPFLAGS = \
+ -I"$(top_srcdir)" \
+ -I"$(top_srcdir)/gnome-initial-setup" \
+ -I"$(top_builddir)" \
-DDATADIR=\""$(datadir)"\" \
-DLIBLOCALEDIR=\""$(prefix)/lib/locale"\" \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\"
@@ -12,6 +15,6 @@ libgislanguage_la_SOURCES = \
locarchive.h \
gis-language-page.c gis-language-page.h
-libgislanguage_la_CFLAGS = $(INITIAL_SETUP_CFLAGS) -I "$(srcdir)/../.."
+libgislanguage_la_CFLAGS = $(INITIAL_SETUP_CFLAGS)
libgislanguage_la_LIBADD = $(INITIAL_SETUP_LIBS)
libgislanguage_la_LDFLAGS = -export_dynamic -avoid-version -module -no-undefined
diff --git a/gnome-initial-setup/pages/language/gis-language-page.c b/gnome-initial-setup/pages/language/gis-language-page.c
index 2b64a5d..db424c2 100644
--- a/gnome-initial-setup/pages/language/gis-language-page.c
+++ b/gnome-initial-setup/pages/language/gis-language-page.c
@@ -39,7 +39,7 @@
#include <glib-object.h>
-#include <egg-list-box/egg-list-box.h>
+#include <egg-list-box.h>
#include "gis-language-page.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]