Revert the bogus .deps file changes and fix the clean rules

[sojka/lightdm.git] / liblightdm-gobject / Makefile.am

diff --git a/liblightdm-gobject/Makefile.am b/liblightdm-gobject/Makefile.am
index 449276ca258748d28e5ef2e82b001d07432768d2..bf376b4cb59fda5ee0ffcb8853455289f5a240a4 100644 (file)
--- a/liblightdm-gobject/Makefile.am
+++ b/liblightdm-gobject/Makefile.am
@@ -1,11 +1,15 @@
 lib_LTLIBRARIES = liblightdm-gobject-1.la
 
 liblightdm_gobject_1_la_LDFLAGS = -export-symbols-regex \^lightdm_.*
-liblightdm_gobject_1_la_LIBADD = $(LIBLIGHTDM_GOBJECT_LIBS)
+liblightdm_gobject_1_la_LIBADD = \
+       $(LIBLIGHTDM_GOBJECT_LIBS) \
+       $(top_builddir)/common/libcommon.la
 liblightdm_gobject_1_la_CFLAGS = $(LIBLIGHTDM_GOBJECT_CFLAGS) \
        $(WARN_CFLAGS) \
+       -I"$(top_srcdir)/common" \
        -DCONFIG_DIR=\"$(sysconfdir)/lightdm\" \
-       -DXSESSIONS_DIR=\"$(datadir)/xsessions\" \
+       -DSESSIONS_DIR=\"$(pkgdatadir)/sessions:$(datadir)/xsessions:$(datadir)/wayland-sessions\" \
+       -DWAYLAND_SESSIONS_DIR=\"$(datadir)/wayland-sessions\" \
        -DREMOTE_SESSIONS_DIR=\"$(pkgdatadir)/remote-sessions\"
 
 mainheader_HEADERS = lightdm.h
@@ -40,8 +44,8 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
 INTROSPECTION_GIRS = LightDM-1.gir
 
 LightDM-1.gir: liblightdm-gobject-1.la
-LightDM_1_gir_INCLUDES = GObject-2.0
-LightDM_1_gir_SCANNERFLAGS = --symbol-prefix=lightdm
+LightDM_1_gir_INCLUDES = GObject-2.0 Gio-2.0
+LightDM_1_gir_SCANNERFLAGS = --symbol-prefix=lightdm --c-include "lightdm.h"
 LightDM_1_gir_LIBS = liblightdm-gobject-1.la
 LightDM_1_gir_FILES = $(liblightdm_gobject_1_la_SOURCES)
 
@@ -53,18 +57,33 @@ typelib_DATA = LightDM-1.typelib
 
 endif
 
+if ENABLE_VAPIGEN
+
+include $(VAPIGEN_MAKEFILE)
+
+liblightdm-gobject-1.vapi: $(gir_DATA) LightDM-1.metadata LightDM-1-custom.vala
+
+VAPIGEN_VAPIS = liblightdm-gobject-1.vapi
+
+liblightdm_gobject_1_vapi_DEPS = gio-2.0 posix
+liblightdm_gobject_1_vapi_METADATADIRS = $(srcdir)
+liblightdm_gobject_1_vapi_FILES = $(gir_DATA) $(srcdir)/LightDM-1-custom.vala
+
 vapidir = $(datadir)/vala/vapi
-dist_vapi_DATA = liblightdm-gobject-1.vapi
+vapi_DATA = $(VAPIGEN_VAPIS) $(srcdir)/liblightdm-gobject-1.deps
+
+endif
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = liblightdm-gobject-1.pc
 
 CLEANFILES = \
        $(gir_DATA) \
-       $(typelib_DATA)
+       $(typelib_DATA) \
+       $(vapi_DATA) \
+       $(pkgconfig_DATA)
 
-DISTCLEANFILES = \
-       Makefile.in \
-       $(pkgconfig_DATA) \
-       $(gir_DATA) \
-       $(typelib_DATA)
+EXTRA_DIST = \
+       LightDM-1.metadata \
+       LightDM-1-custom.vala \
+       liblightdm-gobject-1.deps