Port mouse to the new Makefile.am struct

This commit is contained in:
Jose Maria Celorio 2001-07-17 23:36:52 +00:00
parent 7cd21536ae
commit 4e9c851c46
2 changed files with 20 additions and 15 deletions

View file

@ -1,17 +1,4 @@
@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
bin_PROGRAMS = mouse-properties-capplet
mouse_properties_capplet_LDADD = @CAPPLET_LIBS@
@ -20,6 +7,24 @@ mouse_properties_capplet_SOURCES = \
prefs-widget.c prefs-widget.h \
preferences.c preferences.h
desktop = $(cappletname).desktop
pixmapdir = $(datadir)/pixmaps
pixmap_DATA = \
mouse-left.png \
mouse-right.png
##
## 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)

View file

@ -254,7 +254,7 @@ main (int argc, char **argv)
}
gnome_window_icon_set_default_from_file
(GNOME_ICONDIR"/gnome-mouse.png");
(GNOMECC_ICONS_DIR"/gnome-mouse.png");
#ifdef HAVE_XIMIAN_ARCHIVER
archive = ARCHIVE (archive_load (FALSE));