diff options
| author | Brian Cameron <brian.cameron@sun.com> | 2006-02-15 20:16:53 +0000 |
|---|---|---|
| committer | Brian Cameron <bcameron@src.gnome.org> | 2006-02-15 20:16:53 +0000 |
| commit | 64ab519313559c4c5ac69fe8343e0f42a4b92254 (patch) | |
| tree | 0f1b92004d8789236cf6950289b25180ef275804 /gui/Makefile.am | |
| parent | 81d9c5cffa508e424168cac064a205927ec76366 (diff) | |
| download | gdm-64ab519313559c4c5ac69fe8343e0f42a4b92254.tar.gz | |
Reorganize libraries so that it is easier to build GDM against a test
2006-02-15 Brian Cameron <brian.cameron@sun.com>
* Makefile.am, gui/Makefile.am, gui/greeter/Makefile.am,
utils/gdm-dmx-reconnect-proxy.c: Reorganize libraries so that
it is easier to build GDM against a test Xserver. Fixes bug
#331226. Patch provided by Sylvain Bertrand
<sylvain.bertrand@gmail.com>.
Diffstat (limited to 'gui/Makefile.am')
| -rw-r--r-- | gui/Makefile.am | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/gui/Makefile.am b/gui/Makefile.am index a21f9c86..5e234e44 100644 --- a/gui/Makefile.am +++ b/gui/Makefile.am @@ -89,35 +89,35 @@ gdmchooser_LDADD = \ libgdmwm.a \ libgdmcommon.a \ $(GUIGLADE_LIBS) \ - $(X_LIBS) \ - $(XDMCP_LIBS) \ - -lpopt \ - -lX11 \ - $(XINERAMA_LIBS) \ - $(X_EXTRA_LIBS) \ $(INTLLIBS) \ $(GLIB_LIBS) \ $(GOBJECT_LIBS) \ $(PANGO_LIBS) \ $(GDK_LIBS) \ $(GDKPIXBUF_LIBS) \ - $(top_builddir)/vicious-extensions/libviciousui.a + $(top_builddir)/vicious-extensions/libviciousui.a \ + $(X_EXTRA_LIBS) \ + $(XINERAMA_LIBS) \ + $(X_LIBS) \ + $(XDMCP_LIBS) \ + -lX11 \ + -lpopt gdmlogin_LDADD = \ libgdmwm.a \ libgdmcommon.a \ $(GUING_LIBS) \ - $(X_LIBS) \ - -lX11 \ - $(XINERAMA_LIBS) \ - $(X_EXTRA_LIBS) \ $(INTLLIBS) \ $(GLIB_LIBS) \ $(GOBJECT_LIBS) \ $(GDK_LIBS) \ $(PANGO_LIBS) \ $(GDKPIXBUF_LIBS) \ - $(top_builddir)/vicious-extensions/libviciousui-minimal.a + $(top_builddir)/vicious-extensions/libviciousui-minimal.a \ + $(X_EXTRA_LIBS) \ + $(XINERAMA_LIBS) \ + $(X_LIBS) \ + -lX11 # LIBGNOMEUI should be removed from gdmsetup at some point. # It is needed because it uses gnome_help_display_uri(), which @@ -128,9 +128,6 @@ gdmsetup_LDFLAGS = -export-dynamic gdmsetup_LDADD = \ libgdmcommon.a \ $(GUI_LIBS) \ - $(X_LIBS) \ - -lXau \ - -lX11 \ $(INTLLIBS) \ $(GLIB_LIBS) \ $(GOBJECT_LIBS) \ @@ -139,7 +136,10 @@ gdmsetup_LDADD = \ $(GDKPIXBUF_LIBS) \ $(EXTRA_SETUP_LIBS) \ $(LIBGNOMEUI_LIBS) \ - $(top_builddir)/vicious-extensions/libviciousui.a + $(top_builddir)/vicious-extensions/libviciousui.a \ + $(X_LIBS) \ + -lXau \ + -lX11 gdmphotosetup_LDADD = \ libgdmcommon.a \ @@ -155,41 +155,41 @@ gdmphotosetup_LDADD = \ gdmXnestchooser_LDADD = \ libgdmcommon.a \ $(GUI_LIBS) \ - $(X_LIBS) \ - -lXau \ - -lX11 \ - -lpopt \ $(INTLLIBS) \ $(GLIB_LIBS) \ $(GOBJECT_LIBS) \ $(GDK_LIBS) \ + $(top_builddir)/vicious-extensions/libviciousui.a \ $(EXTRA_XNEST_LIBS) \ - $(top_builddir)/vicious-extensions/libviciousui.a + $(X_LIBS) \ + -lXau \ + -lX11 \ + -lpopt gdmflexiserver_LDADD = \ libgdmcommon.a \ $(GUI_LIBS) \ - $(X_LIBS) \ - -lXau \ - -lpopt \ $(INTLLIBS) \ $(GLIB_LIBS) \ $(GOBJECT_LIBS) \ $(GDK_LIBS) \ + $(top_builddir)/vicious-extensions/libviciousui.a \ $(EXTRA_FLEXI_LIBS) \ - $(top_builddir)/vicious-extensions/libviciousui.a + $(X_LIBS) \ + -lXau \ + -lpopt gdmdynamic_LDADD = \ libgdmcommon.a \ $(GUI_LIBS) \ - $(X_LIBS) \ - -lXau \ $(INTLLIBS) \ $(GLIB_LIBS) \ $(GOBJECT_LIBS) \ $(GDK_LIBS) \ + $(top_builddir)/vicious-extensions/libviciousui.a \ $(EXTRA_DYNAMIC_LIBS) \ - $(top_builddir)/vicious-extensions/libviciousui.a + $(X_LIBS) \ + -lXau Settingsdir = $(datadir)/applications Settings_files = gdmphotosetup.desktop |