diff options
| author | Theppitak Karoonboonyanan <thep@linux.thai.net> | 2010-06-16 20:34:55 -0400 |
|---|---|---|
| committer | William Jon McCann <jmccann@redhat.com> | 2010-06-16 20:34:55 -0400 |
| commit | b55b7e37a7e376e9a1d44ee580c3557e5f9c2881 (patch) | |
| tree | 143724be0b9a92b61937d86dfb7842cfb4212176 | |
| parent | 6d71baa7dc80766cc07b1c3d1d1d37673f0cd896 (diff) | |
| download | gdm-b55b7e37a7e376e9a1d44ee580c3557e5f9c2881.tar.gz | |
Allow non-source-dir build
https://bugzilla.gnome.org/show_bug.cgi?id=570174
| -rw-r--r-- | common/Makefile.am | 6 | ||||
| -rw-r--r-- | daemon/Makefile.am | 1 | ||||
| -rw-r--r-- | gui/simple-greeter/Makefile.am | 1 |
3 files changed, 6 insertions, 2 deletions
diff --git a/common/Makefile.am b/common/Makefile.am index 1e343c9e..03cb46bc 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 731a0412..da18835c 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 46289188..564f95f1 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)\" \ |