← Back to branch summary

~ubuntu-branches/ubuntu/wily/lightdm/wily-proposed

« back to all changes in this revision

Viewing changes to liblightdm-gobject/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Robert Ancell, Robert Ancell, Gunnar Hjalmarsson
  • Date: 2015-08-10 16:11:13 UTC
  • Revision ID: package-import@ubuntu.com-20150810161113-lji1gykoxp1caloq
Tags: 1.15.2-0ubuntu1
https://launchpad.net/bugs/888391
https://launchpad.net/bugs/1482641
[ Robert Ancell ]
* New upstream release:
  - Support Wayland sessions. (LP: #888391)
  - Implement autologin-session option.    
  - Generate Vala bindings from GIR instead of manually writing them. This
    fixes some small bugs in both the Vala and GIR bindings.
  - Don't remove autotools generated files in distclean.
* debian/control:
  - Use standards version 3.9.6
* debian/liblightdm-gobject-1-0.symbols:
  - Updated

[ Gunnar Hjalmarsson ]
* debian/lightdm-session:
  - Prevent ~/.bashrc from being sourced when ~/.profile is sourced.
    (LP: #1482641)

Show diffs side-by-side

added added

removed removed

Lines of Context:
liblightdm-gobject/Makefile.am
8
8
        $(WARN_CFLAGS) \
9
9
        -I"$(top_srcdir)/common" \
10
10
        -DCONFIG_DIR=\"$(sysconfdir)/lightdm\" \
11
 
        -DSESSIONS_DIR=\"$(pkgdatadir)/sessions:$(datadir)/xsessions\" \
 
11
        -DSESSIONS_DIR=\"$(pkgdatadir)/sessions:$(datadir)/xsessions:$(datadir)/wayland-sessions\" \
 
12
        -DWAYLAND_SESSIONS_DIR=\"$(datadir)/wayland-sessions\" \    
12
13
        -DREMOTE_SESSIONS_DIR=\"$(pkgdatadir)/remote-sessions\"
13
14
 
14
15
mainheader_HEADERS = lightdm.h
44
45
 
45
46
LightDM-1.gir: liblightdm-gobject-1.la
46
47
LightDM_1_gir_INCLUDES = GObject-2.0 Gio-2.0
47
 
LightDM_1_gir_SCANNERFLAGS = --symbol-prefix=lightdm
 
48
LightDM_1_gir_SCANNERFLAGS = --symbol-prefix=lightdm --c-include "lightdm.h"
48
49
LightDM_1_gir_LIBS = liblightdm-gobject-1.la
49
50
LightDM_1_gir_FILES = $(liblightdm_gobject_1_la_SOURCES)
50
51
 
56
57
 
57
58
endif
58
59
 
 
60
if ENABLE_VAPIGEN
 
61
 
 
62
include $(VAPIGEN_MAKEFILE)
 
63
 
 
64
liblightdm-gobject-1.vapi: $(gir_DATA) LightDM-1.metadata LightDM-1-custom.vala
 
65
 
 
66
VAPIGEN_VAPIS = liblightdm-gobject-1.vapi
 
67
 
 
68
liblightdm_gobject_1_vapi_DEPS = gio-2.0 posix
 
69
liblightdm_gobject_1_vapi_METADATADIRS = $(srcdir)
 
70
liblightdm_gobject_1_vapi_FILES = $(gir_DATA) $(srcdir)/LightDM-1-custom.vala
 
71
 
59
72
vapidir = $(datadir)/vala/vapi
60
 
dist_vapi_DATA = liblightdm-gobject-1.vapi
 
73
vapi_DATA = $(VAPIGEN_VAPIS) $(srcdir)/liblightdm-gobject-1.deps
 
74
 
 
75
endif
61
76
 
62
77
pkgconfigdir = $(libdir)/pkgconfig
63
78
pkgconfig_DATA = liblightdm-gobject-1.pc
64
79
 
65
80
CLEANFILES = \
66
81
        $(gir_DATA) \
67
 
        $(typelib_DATA)
 
82
        $(typelib_DATA) \
 
83
        $(vapi_DATA)
68
84
 
69
85
DISTCLEANFILES = \
70
 
        Makefile.in \
71
86
        $(pkgconfig_DATA) \
72
87
        $(gir_DATA) \
73
88
        $(typelib_DATA)
 
89
 
 
90
EXTRA_DIST = \
 
91
        LightDM-1.metadata \
 
92
        LightDM-1-custom.vala \
 
93
        liblightdm-gobject-1.deps