From 7cd21536aec98f94c8c3fba85a0c7d7a5d9c7da6 Mon Sep 17 00:00:00 2001 From: Jose Maria Celorio Date: Tue, 17 Jul 2001 23:32:47 +0000 Subject: [PATCH] fix build --- ChangeLog | 4 ++ acconfig.h | 1 + capplets/keyboard/Makefile.am | 25 ++++++----- capplets/mouse/Makefile.am | 43 +++++++------------ ...perties.desktop.in => mouse.desktop.in.in} | 0 configure.in | 14 +++--- 6 files changed, 42 insertions(+), 45 deletions(-) rename capplets/mouse/{mouse-properties.desktop.in => mouse.desktop.in.in} (100%) diff --git a/ChangeLog b/ChangeLog index ccc9fd6ea..517346cc9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2001-07-17 Chema Celorio + + * configure.in (gnome_cv_use_gnome): clean the macro + 2001-07-17 Bradford Hovinen * configure.in (AC_OUTPUT): Disabled rollback capplet diff --git a/acconfig.h b/acconfig.h index 61b43143f..b112f619d 100644 --- a/acconfig.h +++ b/acconfig.h @@ -9,6 +9,7 @@ #undef HAVE_PROGRAM_INVOCATION_NAME #undef HAVE_XIMIAN_ARCHIVER #undef GNOMECC_ICONS_DIR +#undef GNOMECC_GLADE_DIR #undef PACKAGE #undef VERSION diff --git a/capplets/keyboard/Makefile.am b/capplets/keyboard/Makefile.am index fd1053ece..cdef31eeb 100644 --- a/capplets/keyboard/Makefile.am +++ b/capplets/keyboard/Makefile.am @@ -1,12 +1,4 @@ -@XML_I18N_MERGE_DESKTOP_RULE@ -@GNOMECC_CAPPLETS_DESKTOP_IN_RULE@ - cappletname = keyboard - -INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) -CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) -EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST) - bin_PROGRAMS = keyboard-properties keyboard_properties_LDADD = @CAPPLET_LIBS@ $(XF86MISC_LIBS) @@ -15,7 +7,18 @@ keyboard_properties_SOURCES = \ prefs-widget.c prefs-widget.h \ preferences.c preferences.h +## +## You should not need to modify anything below this line +## +@XML_I18N_MERGE_DESKTOP_RULE@ +@GNOMECC_CAPPLETS_DESKTOP_IN_RULE@ + +INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) +CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) +EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST) +iconsdir = $(GNOMECC_ICONS_DIR) +Gladedir = $(GNOMECC_GLADE_DIR) +Glade_DATA = $(cappletname)-properties.glade +icons_DATA = $(cappletname)-capplet.png desktop = $(cappletname).desktop - -all-local: $(desktop) - +all-local: $(desktop) \ No newline at end of file diff --git a/capplets/mouse/Makefile.am b/capplets/mouse/Makefile.am index a2b237e58..2fbe5f295 100644 --- a/capplets/mouse/Makefile.am +++ b/capplets/mouse/Makefile.am @@ -1,38 +1,25 @@ +@XML_I18N_MERGE_DESKTOP_RULE@ +@GNOMECC_CAPPLETS_DESKTOP_IN_RULE@ + +cappletname = mouse + +INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) +CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) +EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST) pixmapdir = $(datadir)/pixmaps pixmap_DATA = \ mouse-left.png \ mouse-right.png -Applicationsdir = $(datadir)/control-center/capplets -Applications_in_files = mouse-properties.desktop.in -Applications_DATA = $(Applications_in_files:.desktop.in=.desktop) -@XML_I18N_MERGE_DESKTOP_RULE@ - -pApplicationsdir = $(datadir)/gnome/apps/Settings/Desktop -pApplications_DATA = $(Applications_DATA) - -Gladedir = $(datadir)/control-center-data -Glade_DATA = \ - mouse-properties.glade - -EXTRA_DIST = $(Applications_in_files) $(Glade_DATA) $(pixmap_DATA) - -INCLUDES = \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \ - -DG_LOG_DOMAIN=\"mouse-properties\" \ - -DGLADE_DATADIR=\""$(Gladedir)"\" \ - @CAPPLET_CFLAGS@ \ - -I$(top_srcdir)/ \ - -I$(top_srcdir)/intl - bin_PROGRAMS = mouse-properties-capplet +mouse_properties_capplet_LDADD = @CAPPLET_LIBS@ mouse_properties_capplet_SOURCES = \ - prefs-widget.c prefs-widget.h \ - preferences.c preferences.h \ - main.c + main.c\ + prefs-widget.c prefs-widget.h \ + preferences.c preferences.h -mouse_properties_capplet_LDADD = \ - @CAPPLET_LIBS@ +desktop = $(cappletname).desktop + +all-local: $(desktop) diff --git a/capplets/mouse/mouse-properties.desktop.in b/capplets/mouse/mouse.desktop.in.in similarity index 100% rename from capplets/mouse/mouse-properties.desktop.in rename to capplets/mouse/mouse.desktop.in.in diff --git a/configure.in b/configure.in index 77a7f5f54..291f4de4c 100644 --- a/configure.in +++ b/configure.in @@ -120,6 +120,9 @@ GNOMECC_CAPPLETS_CFLAGS="${CAPPLET_CFLAGS} -I\$(top_srcdir)/intl -I\$(top_srcdir AC_DEFINE_UNQUOTED(GNOMECC_ICONS_DIR, "${datadir}/${PACKAGE}/icons") GNOMECC_ICONS_DIR=""${datadir}/${PACKAGE}/icons"" AC_SUBST(GNOMECC_ICONS_DIR) +AC_DEFINE_UNQUOTED(GNOMECC_GLADE_DIR, "${datadir}/${PACKAGE}/interfaces") +GNOMECC_GLADE_DIR=""${datadir}/${PACKAGE}/interfaces"" +AC_SUBST(GNOMECC_GLADE_DIR) AC_SUBST(GNOMECC_CAPPLETS_CFLAGS) @@ -136,6 +139,10 @@ dnl Variables for config_archiverConf.sh.in dnl ======================================= +dnl consdir = $(GNOMECC_ICONS_DIR)\ +dnl icons_DATA = $(cappletname)-capplet.png\ +dnl Gladedir = $(datadir)/control-center-data\ +dnl Glade_DATA = $(cappletname)-properties.glade\ dnl ============================================== @@ -143,12 +150,7 @@ dnl End : Macro for the common code dnl ============================================== AC_DEFUN(AC_PROG_GNOMECC_CAPPLETS, [ -GNOMECC_CAPPLETS_DESKTOP_IN_RULE='iconsdir = $(GNOMECC_ICONS_DIR) \ -icons_DATA = $(cappletname)-capplet.png \ -Gladedir = $(datadir)/control-center-data \ -Glade_DATA = $(cappletname)-properties.glade \ -\ -$(desktop).in: \%.desktop.in: \%.desktop.in.in\ +GNOMECC_CAPPLETS_DESKTOP_IN_RULE='$(desktop).in: \%.desktop.in: \%.desktop.in.in\ sed s#Icon=.\*#Icon=$(GNOMECC_ICONS_DIR)/${cappletname}-capplet.png# < $< \> ${cappletname}.desktop.in\ \ install-data-local:\