Merge lp:~agateau/lightdm-gtk-greeter/fix-missing-greeter-ui into lp:~lightdm-team/lightdm-gtk-greeter/trunk

[Aurélien Gâteau]

Make sure code can find greeter.ui (and other files)

It seems variables defined in data/Makefile.am are not available to code in src/Makefile.am. I "fixed" this by moving the content of src/Makefile.am and data/Makefile.am to the toplevel Makefile.am. I'd be happy to update the branch if there is a better way to do this (my autotools skills are a bit rusty)

[Robert Ancell (robert-ancell)]

I've fixed this in master by defining the directory again in src/Makefile.am. That's generally what you do - if you wanted to have it common it would have to be in configure.ac and that has entirely different syntax.

It's autotools. Don't ask too many questions :)

review: Disapprove

Unmerged revisions

8. By Aurélien Gâteau on 2012-01-19

Make sure code can find greeter.ui (and other files)

It seems variables defined in data/Makefile.am are not available to code in
src/Makefile.am. I "fixed" this by moving the content of src/Makefile.am and
data/Makefile.am to the toplevel Makefile.am. I'd be happy to update the branch
if there is a better way to do this (my autotools skills are a bit rusty)

=== modified file 'Makefile.am'
--- Makefile.am	2011-11-29 03:06:00 +0000
+++ Makefile.am	2012-01-19 14:00:30 +0000
@@ -1,4 +1,34 @@
-SUBDIRS = data po src
+SUBDIRS = po
+
+# src
+sbin_PROGRAMS = lightdm-gtk-greeter
+
+lightdm_gtk_greeter_SOURCES = \
+	src/lightdm-gtk-greeter.c
+
+lightdm_gtk_greeter_CFLAGS = \
+	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
+	-DLOCALEDIR=\""$(localedir)"\" \
+	-DGREETER_DATA_DIR=\""$(greeterdatadir)"\" \
+	-DCONFIG_FILE=\""$(configdir)/lightdm-gtk-greeter.conf"\" \
+	$(GREETER_CFLAGS) \
+	$(WARN_CFLAGS)
+
+lightdm_gtk_greeter_LDADD = \
+	$(GREETER_LIBS)
+
+# data
+greeterdatadir = $(datadir)/lightdm-gtk-greeter
+dist_greeterdata_DATA = data/greeter.ui
+
+xgreetersdir = $(datadir)/xgreeters
+dist_xgreeters_DATA = data/lightdm-gtk-greeter.desktop
+
+icondir = $(greeterdatadir)/hicolor/scalable/apps
+dist_icon_DATA = data/accessibility.svg data/system-shutdown.svg
+
+configdir = $(sysconfdir)/lightdm
+dist_config_DATA = data/lightdm-gtk-greeter.conf
 
 EXTRA_DIST = \
 	autogen.sh \

=== modified file 'configure.ac'
--- configure.ac	2012-01-12 11:21:41 +0000
+++ configure.ac	2012-01-19 14:00:30 +0000
@@ -37,8 +37,6 @@
 
 AC_CONFIG_FILES([
 Makefile
-data/Makefile
 po/Makefile.in
-src/Makefile
 ])
 AC_OUTPUT

=== removed file 'data/Makefile.am'
--- data/Makefile.am	2011-11-29 03:06:00 +0000
+++ data/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-greeterdatadir = $(datadir)/lightdm-gtk-greeter
-dist_greeterdata_DATA = greeter.ui
-
-xgreetersdir = $(datadir)/xgreeters
-dist_xgreeters_DATA = lightdm-gtk-greeter.desktop
-
-icondir = $(greeterdatadir)/hicolor/scalable/apps
-dist_icon_DATA = accessibility.svg system-shutdown.svg
-
-configdir = $(sysconfdir)/lightdm
-dist_config_DATA = lightdm-gtk-greeter.conf
-
-DISTCLEANFILES = \
-	Makefile.in

=== removed file 'src/Makefile.am'
--- src/Makefile.am	2011-11-29 03:06:00 +0000
+++ src/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-sbin_PROGRAMS = lightdm-gtk-greeter
-
-lightdm_gtk_greeter_SOURCES = \
-	lightdm-gtk-greeter.c
-
-lightdm_gtk_greeter_CFLAGS = \
-	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
-	-DLOCALEDIR=\""$(localedir)"\" \
-	-DGREETER_DATA_DIR=\""$(greeterdatadir)"\" \
-	-DCONFIG_FILE=\""$(configdir)/lightdm-gtk-greeter.conf"\" \
-	$(GREETER_CFLAGS) \
-	$(WARN_CFLAGS)
-
-lightdm_gtk_greeter_LDADD = \
-	$(GREETER_LIBS)
-
-DISTCLEANFILES = \
-	Makefile.in