diff -Nur xfce-mcs-plugins-4.4.1/plugins/keyboard_plugin/Makefile.in xfce-mcs-plugins-4.4.1.new/plugins/keyboard_plugin/Makefile.in --- xfce-mcs-plugins-4.4.1/plugins/keyboard_plugin/Makefile.in 2007-05-04 05:10:18.000000000 +0200 +++ xfce-mcs-plugins-4.4.1.new/plugins/keyboard_plugin/Makefile.in 2007-05-04 05:19:17.000000000 +0200 @@ -74,7 +74,8 @@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) am_keyboard_plugin_la_OBJECTS = keyboard_plugin_la-keyboard_plugin.lo \ keyboard_plugin_la-shortcuts_plugin.lo \ - keyboard_plugin_la-keys_management.lo + keyboard_plugin_la-keys_management.lo \ + keyboard_plugin_la-layouts_settings.lo keyboard_plugin_la_OBJECTS = $(am_keyboard_plugin_la_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp @@ -180,6 +182,10 @@ LIBXFCEGUI4_LIBS = @LIBXFCEGUI4_LIBS@ LIBXFCEGUI4_REQUIRED_VERSION = @LIBXFCEGUI4_REQUIRED_VERSION@ LIBXFCEGUI4_VERSION = @LIBXFCEGUI4_VERSION@ +LIBXKLAVIER_CFLAGS = `pkg-config --cflags libxklavier` +LIBXKLAVIER_LIBS = `pkg-config --libs libxklavier` +LIBXKLAVIER_REQUIRED_VERSION = +LIBXKLAVIER_VERSION = LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ @@ -294,7 +307,9 @@ shortcuts_plugin.c \ shortcuts_plugin.h \ keys_management.c \ - keys_management.h + keys_management.h \ + layouts_settings.c \ + layouts_settings.h keyboard_plugin_la_CFLAGS = \ $(LIBX11_CFLAGS) \ @@ -302,13 +317,15 @@ $(LIBXFCEGUI4_CFLAGS) \ $(XFCE_MCS_MANAGER_CFLAGS) \ $(XKB_CFLAGS) \ - $(PLATFORM_CFLAGS) + $(PLATFORM_CFLAGS) \ + $(LIBXKLAVIER_CFLAGS) keyboard_plugin_la_LDFLAGS = -avoid-version -module -no-undefined \ $(PLATFORM_LDFLAGS) $(am__append_1) keyboard_plugin_la_LIBADD = \ $(top_builddir)/plugins/gtk_common/libgtkcommon.la \ - $(LIBX11_LDFLAGS) $(XF86MISC_LIBS) $(XKB_LIBS) $(am__append_2) + $(LIBX11_LDFLAGS) $(XF86MISC_LIBS) $(XKB_LIBS) \ + $(LIBXKLAVIER_LIBS) $(am__append_2) desktopdir = $(datadir)/applications desktop_in_files = xfce-keyboard-settings.desktop.in desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) @@ -392,6 +409,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keyboard_plugin_la-keyboard_plugin.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keyboard_plugin_la-keys_management.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keyboard_plugin_la-layouts_settings.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keyboard_plugin_la-shortcuts_plugin.Plo@am__quote@ .c.o: @@ -436,6 +454,13 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(keyboard_plugin_la_CFLAGS) $(CFLAGS) -c -o keyboard_plugin_la-keys_management.lo `test -f 'keys_management.c' || echo '$(srcdir)/'`keys_management.c +keyboard_plugin_la-layouts_settings.lo: layouts_settings.c +@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(keyboard_plugin_la_CFLAGS) $(CFLAGS) -MT keyboard_plugin_la-layouts_settings.lo -MD -MP -MF "$(DEPDIR)/keyboard_plugin_la-layouts_settings.Tpo" -c -o keyboard_plugin_la-layouts_settings.lo `test -f 'layouts_settings.c' || echo '$(srcdir)/'`layouts_settings.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/keyboard_plugin_la-layouts_settings.Tpo" "$(DEPDIR)/keyboard_plugin_la-layouts_settings.Plo"; else rm -f "$(DEPDIR)/keyboard_plugin_la-layouts_settings.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='layouts_settings.c' object='keyboard_plugin_la-layouts_settings.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(keyboard_plugin_la_CFLAGS) $(CFLAGS) -c -o keyboard_plugin_la-layouts_settings.lo `test -f 'layouts_settings.c' || echo '$(srcdir)/'`layouts_settings.c + mostlyclean-libtool: -rm -f *.lo
