[gdm] Allow non-source-dir build
- From: William Jon McCann <mccann src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gdm] Allow non-source-dir build
- Date: Thu, 17 Jun 2010 00:40:59 +0000 (UTC)
commit b55b7e37a7e376e9a1d44ee580c3557e5f9c2881
Author: Theppitak Karoonboonyanan <thep linux thai net>
Date: Wed Jun 16 20:34:55 2010 -0400
Allow non-source-dir build
https://bugzilla.gnome.org/show_bug.cgi?id=570174
common/Makefile.am | 6 ++++--
daemon/Makefile.am | 1 +
gui/simple-greeter/Makefile.am | 1 +
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/common/Makefile.am b/common/Makefile.am
index 1e343c9..03cb46b 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -70,8 +70,6 @@ endif
libgdmcommon_la_SOURCES = \
gdm-address.h \
gdm-address.c \
- gdm-marshal.c \
- gdm-marshal.h \
gdm-common.h \
gdm-common.c \
gdm-common-unknown-origin.h \
@@ -100,6 +98,10 @@ libgdmcommon_la_SOURCES = \
$(MKDTEMP_FILES) \
$(NULL)
+nodist_libgdmcommon_la_SOURCES = \
+ gdm-marshal.c \
+ gdm-marshal.h
+
libgdmcommon_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
$(DISABLE_DEPRECATED_CFLAGS) \
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 731a041..da18835 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -4,6 +4,7 @@ AM_CPPFLAGS = \
-I. \
-I.. \
-I$(top_srcdir)/common \
+ -I$(top_builddir)/common \
-DAUTHDIR=\"$(authdir)\" \
-DBINDIR=\"$(bindir)\" \
-DDATADIR=\"$(datadir)\" \
diff --git a/gui/simple-greeter/Makefile.am b/gui/simple-greeter/Makefile.am
index 4628918..564f95f 100644
--- a/gui/simple-greeter/Makefile.am
+++ b/gui/simple-greeter/Makefile.am
@@ -6,6 +6,7 @@ SUBDIRS = \
AM_CPPFLAGS = \
-I$(top_srcdir)/common \
+ -I$(top_builddir)/common \
-I$(top_srcdir)/gui/simple-greeter/libnotificationarea \
-DDMCONFDIR=\""$(dmconfdir)"\" \
-DGDMCONFDIR=\"$(gdmconfdir)\" \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]