From 3e862fae1560045cdc3661eeb3839b406a3056b5 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 19 Jun 2010 13:05:45 +1000 Subject: [PATCH] Make libldmgreeter library --- .bzrignore | 5 +-- Makefile.am | 2 +- configure.ac | 23 ++++++++------ greeters/Makefile.am | 43 ++++++++++++++++++++++++++ {src => greeters}/ldm-gtk-greeter.c | 0 {src => greeters}/ldm-webkit-greeter.c | 0 libldmgreeter/Makefile.am | 19 ++++++++++++ {src => libldmgreeter}/greeter.c | 0 {src => libldmgreeter}/greeter.h | 0 libldmgreeter/libldmgreeter-1.pc.in | 10 ++++++ src/Makefile.am | 34 -------------------- 11 files changed, 90 insertions(+), 46 deletions(-) create mode 100644 greeters/Makefile.am rename {src => greeters}/ldm-gtk-greeter.c (100%) rename {src => greeters}/ldm-webkit-greeter.c (100%) create mode 100644 libldmgreeter/Makefile.am rename {src => libldmgreeter}/greeter.c (100%) rename {src => libldmgreeter}/greeter.h (100%) create mode 100644 libldmgreeter/libldmgreeter-1.pc.in diff --git a/.bzrignore b/.bzrignore index cac1372d..4de393d9 100644 --- a/.bzrignore +++ b/.bzrignore @@ -14,13 +14,14 @@ aclocal.m4 depcomp omf.make xmldocs.make +greeters/ldm-webkit-greeter +greeters/ldm-gtk-greeter po/stamp-it po/POTFILES src/lightdm -src/ldm-webkit-greeter -src/ldm-gtk-greeter src/display-glue.h src/display-manager-glue.h src/user-manager-glue.h src/session-manager-glue.h src/ldmwkgreeter +libldmgreeter/libldmgreeter-1.pc diff --git a/Makefile.am b/Makefile.am index 50c066b5..a2f46021 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = data po src themes +SUBDIRS = libldmgreeter data greeters po src themes EXTRA_DIST = \ autogen.sh \ diff --git a/configure.ac b/configure.ac index 47bf67f0..e6fdc585 100644 --- a/configure.ac +++ b/configure.ac @@ -1,15 +1,11 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(configure.ac) -AM_INIT_AUTOMAKE(lightdm, 0.0.1) +AC_INIT(lightdm, 0.0.1) +AM_INIT_AUTOMAKE +AM_SILENT_RULES([yes]) +LT_INIT +AM_PROG_CC_C_O AM_MAINTAINER_MODE -GNOME_MAINTAINER_MODE_DEFINES -m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) - -AC_ISC_POSIX -AC_PROG_CC_C_O -AM_PROG_CC_STDC -AC_HEADER_STDC AM_GCONF_SOURCE_2 @@ -26,6 +22,12 @@ PKG_CHECK_MODULES(LIGHTDM, [ ck-connector ]) +PKG_CHECK_MODULES(LIBLDMGREETER, [ + glib-2.0 + gobject-2.0 + dbus-glib-1 +]) + PKG_CHECK_MODULES(LIGHTDM_GREETER, [ gtk+-2.0 dbus-glib-1 @@ -138,6 +140,9 @@ dnl ########################################################################### AC_OUTPUT([ Makefile data/Makefile +greeters/Makefile +libldmgreeter/libldmgreeter-1.pc +libldmgreeter/Makefile po/Makefile.in src/Makefile themes/Makefile diff --git a/greeters/Makefile.am b/greeters/Makefile.am new file mode 100644 index 00000000..d4ee1f5e --- /dev/null +++ b/greeters/Makefile.am @@ -0,0 +1,43 @@ +libexec_PROGRAMS = ldm-gtk-greeter ldm-webkit-greeter + +LIBGREETER_LIB = $(top_builddir)/libldmgreeter/libldmgreeter.la +LIBGREETER_CFLAGS = \ + -I$(top_srcdir)/libldmgreeter +LIBGREETER_LDADD = \ + -L$(top_srcdir)/libldmgreeter \ + -lldmgreeter + +ldm_gtk_greeter_SOURCES = \ + ldm-gtk-greeter.c + +ldm_gtk_greeter_CFLAGS = \ + $(LIBGREETER_CFLAGS) \ + $(LIGHTDM_GREETER_CFLAGS) \ + $(WARN_CFLAGS) \ + -DVERSION=\"$(VERSION)\" \ + -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \ + -DLOCALE_DIR=\"$(localedir)\" \ + -DLIGHTDM_GREETER_BINARY=\"ldm-gtk-greeter\" + +ldm_gtk_greeter_LDADD = \ + $(LIBGREETER_LDADD) \ + $(LIGHTDM_GREETER_LIBS) + +ldm_webkit_greeter_SOURCES = \ + ldm-webkit-greeter.c + +ldm_webkit_greeter_CFLAGS = \ + $(LIBGREETER_CFLAGS) \ + $(LIGHTDM_WKGREETER_CFLAGS) \ + $(WARN_CFLAGS) \ + -DVERSION=\"$(VERSION)\" \ + -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \ + -DLOCALE_DIR=\"$(localedir)\" \ + -DLIGHTDM_WKGREETER_BINARY=\"ldm-webkit-greeter\" + +ldm_webkit_greeter_LDADD = \ + $(LIBGREETER_LDADD) \ + $(LIGHTDM_WKGREETER_LIBS) + +DISTCLEANFILES = \ + Makefile.in diff --git a/src/ldm-gtk-greeter.c b/greeters/ldm-gtk-greeter.c similarity index 100% rename from src/ldm-gtk-greeter.c rename to greeters/ldm-gtk-greeter.c diff --git a/src/ldm-webkit-greeter.c b/greeters/ldm-webkit-greeter.c similarity index 100% rename from src/ldm-webkit-greeter.c rename to greeters/ldm-webkit-greeter.c diff --git a/libldmgreeter/Makefile.am b/libldmgreeter/Makefile.am new file mode 100644 index 00000000..9af40a85 --- /dev/null +++ b/libldmgreeter/Makefile.am @@ -0,0 +1,19 @@ +lib_LTLIBRARIES = libldmgreeter.la + +libldmgreeterinclude_HEADERS = \ + greeter.h + +libldmgreeter_la_LIBADD = $(LIBLDMGREETER_LIBS) +libldmgreeter_la_CFLAGS = $(LIBLDMGREETER_CFLAGS) + +libldmgreeter_la_SOURCES= \ + greeter.c + +libldmgreeterincludedir=$(includedir)/lightdm-1.0 + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = libldmgreeter-1.pc + +DISTCLEANFILES = \ + Makefile.in \ + libldmgreeter-1.pc diff --git a/src/greeter.c b/libldmgreeter/greeter.c similarity index 100% rename from src/greeter.c rename to libldmgreeter/greeter.c diff --git a/src/greeter.h b/libldmgreeter/greeter.h similarity index 100% rename from src/greeter.h rename to libldmgreeter/greeter.h diff --git a/libldmgreeter/libldmgreeter-1.pc.in b/libldmgreeter/libldmgreeter-1.pc.in new file mode 100644 index 00000000..015d49ab --- /dev/null +++ b/libldmgreeter/libldmgreeter-1.pc.in @@ -0,0 +1,10 @@ +prefix=@prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: libldmgreeter +Description: LightDM greeter library +Version: @VERSION@ +Requires: glib-2.0 dbus-glib-1 +Libs: -L${libdir} -lldmgreeter +Cflags: -I${includedir}/lightdm-1.0 diff --git a/src/Makefile.am b/src/Makefile.am index 127e5ea9..c84ff07d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,5 @@ bin_PROGRAMS = lightdm -libexec_PROGRAMS = ldm-gtk-greeter ldm-webkit-greeter - display-glue.h: display.xml $(DBUSBINDINGTOOL) --prefix=display --mode=glib-server --output=$@ $^ display-manager-glue.h: display-manager.xml @@ -24,16 +22,6 @@ lightdm_SOURCES = \ user-manager.c \ user-manager.h -ldm_gtk_greeter_SOURCES = \ - greeter.c \ - greeter.h \ - ldm-gtk-greeter.c - -ldm_webkit_greeter_SOURCES = \ - greeter.c \ - greeter.h \ - ldm-webkit-greeter.c - BUILT_SOURCES = \ display-glue.h \ display-manager-glue.h \ @@ -61,28 +49,6 @@ lightdm_LDADD = \ $(LIGHTDM_LIBS) \ -lpam -ldm_gtk_greeter_CFLAGS = \ - $(LIGHTDM_GREETER_CFLAGS) \ - $(WARN_CFLAGS) \ - -DVERSION=\"$(VERSION)\" \ - -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \ - -DLOCALE_DIR=\"$(localedir)\" \ - -DLIGHTDM_GREETER_BINARY=\"ldm-gtk-greeter\" - -ldm_gtk_greeter_LDADD = \ - $(LIGHTDM_GREETER_LIBS) - -ldm_webkit_greeter_CFLAGS = \ - $(LIGHTDM_WKGREETER_CFLAGS) \ - $(WARN_CFLAGS) \ - -DVERSION=\"$(VERSION)\" \ - -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \ - -DLOCALE_DIR=\"$(localedir)\" \ - -DLIGHTDM_WKGREETER_BINARY=\"ldm-webkit-greeter\" - -ldm_webkit_greeter_LDADD = \ - $(LIGHTDM_WKGREETER_LIBS) - DISTCLEANFILES = \ $(BUILT_SOURCES) \ Makefile.in -- 2.39.2