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

Proposed by Aurélien Gâteau on 2012-01-19
Status: Rejected
Rejected by: Robert Ancell on 2012-01-31
Proposed branch: lp:~agateau/lightdm-gtk-greeter/fix-missing-greeter-ui
Merge into: lp:~lightdm-team/lightdm-gtk-greeter/trunk
Diff against target: 94 lines (+31/-35) 4 files modified
To merge this branch: bzr merge lp:~agateau/lightdm-gtk-greeter/fix-missing-greeter-ui
Reviewer Review Type Date Requested Status
Robert Ancell 2012-01-19 Disapprove on 2012-01-31
Review via email: mp+89239@code.launchpad.net

Description of the Change

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)

To post a comment you must log in.
Robert Ancell (robert-ancell) wrote :

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)

Preview Diff

1=== modified file 'Makefile.am'
2--- Makefile.am 2011-11-29 03:06:00 +0000
3+++ Makefile.am 2012-01-19 14:00:30 +0000
4@@ -1,4 +1,34 @@
5-SUBDIRS = data po src
6+SUBDIRS = po
7+
8+# src
9+sbin_PROGRAMS = lightdm-gtk-greeter
10+
11+lightdm_gtk_greeter_SOURCES = \
12+ src/lightdm-gtk-greeter.c
13+
14+lightdm_gtk_greeter_CFLAGS = \
15+ -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
16+ -DLOCALEDIR=\""$(localedir)"\" \
17+ -DGREETER_DATA_DIR=\""$(greeterdatadir)"\" \
18+ -DCONFIG_FILE=\""$(configdir)/lightdm-gtk-greeter.conf"\" \
19+ $(GREETER_CFLAGS) \
20+ $(WARN_CFLAGS)
21+
22+lightdm_gtk_greeter_LDADD = \
23+ $(GREETER_LIBS)
24+
25+# data
26+greeterdatadir = $(datadir)/lightdm-gtk-greeter
27+dist_greeterdata_DATA = data/greeter.ui
28+
29+xgreetersdir = $(datadir)/xgreeters
30+dist_xgreeters_DATA = data/lightdm-gtk-greeter.desktop
31+
32+icondir = $(greeterdatadir)/hicolor/scalable/apps
33+dist_icon_DATA = data/accessibility.svg data/system-shutdown.svg
34+
35+configdir = $(sysconfdir)/lightdm
36+dist_config_DATA = data/lightdm-gtk-greeter.conf
37
38 EXTRA_DIST = \
39 autogen.sh \
40
41=== modified file 'configure.ac'
42--- configure.ac 2012-01-12 11:21:41 +0000
43+++ configure.ac 2012-01-19 14:00:30 +0000
44@@ -37,8 +37,6 @@
45
46 AC_CONFIG_FILES([
47 Makefile
48-data/Makefile
49 po/Makefile.in
50-src/Makefile
51 ])
52 AC_OUTPUT
53
54=== removed file 'data/Makefile.am'
55--- data/Makefile.am 2011-11-29 03:06:00 +0000
56+++ data/Makefile.am 1970-01-01 00:00:00 +0000
57@@ -1,14 +0,0 @@
58-greeterdatadir = $(datadir)/lightdm-gtk-greeter
59-dist_greeterdata_DATA = greeter.ui
60-
61-xgreetersdir = $(datadir)/xgreeters
62-dist_xgreeters_DATA = lightdm-gtk-greeter.desktop
63-
64-icondir = $(greeterdatadir)/hicolor/scalable/apps
65-dist_icon_DATA = accessibility.svg system-shutdown.svg
66-
67-configdir = $(sysconfdir)/lightdm
68-dist_config_DATA = lightdm-gtk-greeter.conf
69-
70-DISTCLEANFILES = \
71- Makefile.in
72
73=== removed file 'src/Makefile.am'
74--- src/Makefile.am 2011-11-29 03:06:00 +0000
75+++ src/Makefile.am 1970-01-01 00:00:00 +0000
76@@ -1,18 +0,0 @@
77-sbin_PROGRAMS = lightdm-gtk-greeter
78-
79-lightdm_gtk_greeter_SOURCES = \
80- lightdm-gtk-greeter.c
81-
82-lightdm_gtk_greeter_CFLAGS = \
83- -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
84- -DLOCALEDIR=\""$(localedir)"\" \
85- -DGREETER_DATA_DIR=\""$(greeterdatadir)"\" \
86- -DCONFIG_FILE=\""$(configdir)/lightdm-gtk-greeter.conf"\" \
87- $(GREETER_CFLAGS) \
88- $(WARN_CFLAGS)
89-
90-lightdm_gtk_greeter_LDADD = \
91- $(GREETER_LIBS)
92-
93-DISTCLEANFILES = \
94- Makefile.in

Subscribers

People subscribed via source and target branches