diff options
| author | George Lebl <jirka@5z.com> | 2003-12-31 18:04:12 +0000 |
|---|---|---|
| committer | George Lebl <jirka@src.gnome.org> | 2003-12-31 18:04:12 +0000 |
| commit | 69ed6b1843bb78c672b7a532299fa5ecb540ef82 (patch) | |
| tree | ba68c267a6421c4f9e719d9b60d2a3f17b089814 | |
| parent | 615641ee82f29ea557800799a68a93e3cf88df32 (diff) | |
| download | gdm-gnome-2-2.tar.gz | |
add the damn OrigTree.pm file here to make intltool happygnome-2-2
Wed Dec 31 10:00:40 2003 George Lebl <jirka@5z.com>
* Makefile.am: add the damn OrigTree.pm file here to make intltool
happy
* daemon/Makefile.am, gui/Makefile.am, gui/greeter/Makefile.am:
remove the DEPRECATED checks to allow compiling with new gtk+
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | daemon/Makefile.am | 11 | ||||
| -rw-r--r-- | gui/Makefile.am | 11 | ||||
| -rw-r--r-- | gui/greeter/Makefile.am | 11 |
6 files changed, 28 insertions, 16 deletions
@@ -1,3 +1,11 @@ +Wed Dec 31 10:00:40 2003 George Lebl <jirka@5z.com> + + * Makefile.am: add the damn OrigTree.pm file here to make intltool + happy + + * daemon/Makefile.am, gui/Makefile.am, gui/greeter/Makefile.am: + remove the DEPRECATED checks to allow compiling with new gtk+ + Thu Oct 16 10:04:31 2003 George Lebl <jirka@5z.com> * Release 2.4.1.7 diff --git a/Makefile.am b/Makefile.am index 7f6f247d..e4243095 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,6 +20,7 @@ EXTRA_DIST = \ intltool-extract.in \ intltool-merge.in \ intltool-update.in \ + intltool-modules/XML/Parser/Style/OrigTree.pm \ gdm-stop.in \ gdm-restart.in \ gdm-safe-restart.in \ diff --git a/configure.in b/configure.in index 5b4a331b..7e47ab31 100644 --- a/configure.in +++ b/configure.in @@ -8,7 +8,7 @@ dnl AC_PROG_INTLTOOL([0.21]) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(gdm,2.4.1.7) +AM_INIT_AUTOMAKE(gdm,2.4.1.8) AM_MAINTAINER_MODE GDK_PIXBUF_REQUIRED=1.3.1 diff --git a/daemon/Makefile.am b/daemon/Makefile.am index db52016a..b6094fc1 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -4,11 +4,6 @@ DEFS = @DEFS@ -DGDM_CONFIG_FILE=\"@sysconfdir@/gdm/gdm.conf\" INCLUDES = \ -I. \ -I.. \ - -DG_DISABLE_DEPRECATED \ - -DGDK_DISABLE_DEPRECATED \ - -DGDK_PIXBUF_DISABLE_DEPRECATED \ - -DGTK_DISABLE_DEPRECATED \ - -DGNOME_DISABLE_DEPRECATED \ -I$(top_srcdir)/vicious-extensions \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ -DLOCALEDIR=\"$(datadir)/locale\" \ @@ -16,6 +11,12 @@ INCLUDES = \ -DPAM_PREFIX=\"$(PAM_PREFIX)\" \ $(GNOME_INCLUDEDIR) +# -DG_DISABLE_DEPRECATED \ +# -DGDK_DISABLE_DEPRECATED \ +# -DGDK_PIXBUF_DISABLE_DEPRECATED \ +# -DGTK_DISABLE_DEPRECATED \ +# -DGNOME_DISABLE_DEPRECATED \ + bin_PROGRAMS = gdm-binary diff --git a/gui/Makefile.am b/gui/Makefile.am index 88810156..52421ee8 100644 --- a/gui/Makefile.am +++ b/gui/Makefile.am @@ -9,16 +9,17 @@ DEFS = @DEFS@ -DGDM_CONFIG_FILE=\"@sysconfdir@/gdm/gdm.conf\" \ INCLUDES = \ -I. \ -I.. \ - -DG_DISABLE_DEPRECATED \ - -DGDK_DISABLE_DEPRECATED \ - -DGDK_PIXBUF_DISABLE_DEPRECATED \ - -DGTK_DISABLE_DEPRECATED \ - -DGNOME_DISABLE_DEPRECATED \ -I$(top_srcdir)/daemon \ -I$(top_srcdir)/vicious-extensions \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ $(GUI_CFLAGS) +# -DG_DISABLE_DEPRECATED \ +# -DGDK_DISABLE_DEPRECATED \ +# -DGDK_PIXBUF_DISABLE_DEPRECATED \ +# -DGTK_DISABLE_DEPRECATED \ +# -DGNOME_DISABLE_DEPRECATED \ + noinst_LIBRARIES = libgdmwm.a libgdmlang.a bin_PROGRAMS = \ diff --git a/gui/greeter/Makefile.am b/gui/greeter/Makefile.am index 8366b7d6..645d7583 100644 --- a/gui/greeter/Makefile.am +++ b/gui/greeter/Makefile.am @@ -3,11 +3,6 @@ SUBDIRS = . themes ## Process this file with automake to produce makefile.in INCLUDES = \ -I. \ - -DG_DISABLE_DEPRECATED \ - -DGDK_DISABLE_DEPRECATED \ - -DGDK_PIXBUF_DISABLE_DEPRECATED \ - -DGTK_DISABLE_DEPRECATED \ - -DGNOME_DISABLE_DEPRECATED \ -I$(top_srcdir)/gui \ -I$(top_srcdir)/daemon \ -I$(top_srcdir)/vicious-extensions \ @@ -16,6 +11,12 @@ INCLUDES = \ -DGREETERTHEMEDIR=\""$(datadir)/gdm/themes"\" \ $(GREETER_CFLAGS) +# -DG_DISABLE_DEPRECATED \ +# -DGDK_DISABLE_DEPRECATED \ +# -DGDK_PIXBUF_DISABLE_DEPRECATED \ +# -DGTK_DISABLE_DEPRECATED \ +# -DGNOME_DISABLE_DEPRECATED \ + bin_PROGRAMS = \ gdmgreeter |