Unify the build process. Clean makefiles and add new icons

capplets/wm-properties/Makefile.am

@@ -1,25 +1,31 @@
-INCLUDES = -I. -I$(srcdir) 				\
-	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
-	@CAPPLET_CFLAGS@
+SUBDIRS = wm-desktops
 
+cappletname = wm
+cappletgroup = "Advanced/"
 bin_PROGRAMS = wm-properties-capplet
 
-
+wm_properties_capplet_LDADD = $(GNOMECC_CAPPLETS_LIBS)
 wm_properties_capplet_SOURCES = \
-	wm-properties.h          \
-	wm-properties-capplet.c	 \
-	wm-list.c                \
+	wm-properties.h         \
+	wm-properties-capplet.c \
+	wm-list.c               \
 	wm-exec.c
 
-wm_properties_capplet_LDADD = @CAPPLET_LIBS@
+pixmap_DATA = 
 
-EXTRA_DIST = wm-properties.desktop 
+##
+## You should not need to modify anything below this line
+##
+@XML_I18N_MERGE_DESKTOP_RULE@
+@GNOMECC_CAPPLETS_DESKTOP_IN_RULE@
 
-SUBDIRS=wm-desktops
-
-sysdir = $(datadir)/control-center/capplets/Advanced/
-sys_DATA = wm-properties.desktop
-
-psysdir = $(datadir)/gnome/apps/Settings/Advanced
-psys_DATA = wm-properties.desktop
+INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)
+CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
+EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST)
+iconsdir   = $(GNOMECC_ICONS_DIR)
+Gladedir   = $(GNOMECC_GLADE_DIR)
+pixmapdir  = $(GNOMECC_PIXMAPS_DIR)
+Glade_DATA = $(cappletname)-properties.glade
+icons_DATA = $(cappletname)-capplet.png
+desktop    = $(cappletname).desktop
+all-local: $(desktop)

capplets/wm-properties/wm.desktop.in.in

@@ -0,0 +1,61 @@
+[Desktop Entry]
+Name=Window Manager
+Name[pt_BR]=Gerenciador de Janelas
+Name[ca]=Gestor de finestres
+Name[cs]=Správce oken
+Name[da]=Vindueshåndtering
+Name[de]=Fenstermanager
+Name[el]=Äéá÷åéñéóôÞò Ðáñáèýñùí
+Name[es]=Gestor de ventanas
+Name[et]=Aknahaldur
+Name[fi]=Ikkunointiohjelma
+Name[fr]=Gestionnaire de fenêtres
+Name[gl]=Xestor de fiestras
+Name[hu]=Ablakkezelõ
+Name[it]=Window manager
+Name[ja]=¥¦¥£¥ó¥É¥¦¥Þ¥Í¡¼¥¸¥ã
+Name[ko]=â °ü¸®ÀÚ
+Name[lt]=Langø tvarkyklë
+Name[no]=Vindushåndterer
+Name[pl]=Mened¿er okien
+Name[pt]=Gestor de Janelas
+Name[ro]=Manager de ferestre
+Name[sl]=Upravljalnik oken
+Name[sv]=Fönsterhanterare
+Name[tr]=Pencere yöneticisi
+Name[uk]=÷¦ËÏÎÎÉÊ ÍÅÎÅÄÖÅÒ
+Name[wa]=Manaedjeu di purneas
+Name[zh_TW.Big5]=µøµ¡ºÞ²zµ{¦¡
+Name[zh_CN.GB2312]=ÊÓ´°¹ÜÀí³Ìʽ
+Comment=Choose a window manager
+Comment[pt_BR]=Selecionar um gerenciador de janelas
+Comment[ca]=Permet escollir el gestor de finestres.
+Comment[cs]=Volba správce oken
+Comment[da]=Vælg en vindueshåndterer.
+Comment[de]=Einen Fenstermanager auswählen
+Comment[es]=ÅðéëïãÞ äéá÷åéñéóôÞò ðáñáèýñùí
+Comment[es]=Permite elegir gestor de ventanas a usar con GNOME
+Comment[et]=Määrab aknahalduri
+Comment[fi]=Valitse ikkunointiohjelma
+Comment[fr]=Configuration du gestionnaire de fenêtres à utiliser avec GNOME
+Comment[gl]=Excoller un xestor de fiestras para usar con GNOME
+Comment[hu]=Ablakkezelõ választása
+Comment[it]=Selezione del Window Manager usato in GNOME
+Comment[ja]=¥¦¥£¥ó¥É¥¦¥Þ¥Í¡¼¥¸¥ã¤òÁª¤ó¤Ç²¼¤µ¤¤
+Comment[ko]=â °ü¸®ÀÚ ¼±ÅÃ
+Comment[lt]=Pasirinkti langø tvarkyklæ
+Comment[no]=Velg en vindushåndterer
+Comment[pl]=Wybór mened¿era okien
+Comment[pt]=Escolha o seu gestor de janelas
+Comment[ro]=Alegeþi un manager de ferestre
+Comment[sl]=Izberite upravljalca oken
+Comment[sv]=Välj en fönsterhanterare
+Comment[tr]=Bir pencere yöneticisini seç
+Comment[uk]=÷ÉÂ¦Ò ×¦ËÏÎÎÏÇÏ ÍÅÎÅÄÖÅÒÁ
+Comment[wa]=Tchwezixhoz li manaedjeu di purneas a eployî avou GNOME
+Comment[zh_TW.Big5]=¿ï¾Ü±z©Ò¨Ï¥Îªºµøµ¡ºÞ²zµ{¦¡
+Comment[zh_CN.GB2312]=Ñ¡ÔñÄúËùʹÓõÄÊÓ´°¹ÜÀí³Ìʽ
+Exec=wm-properties-capplet --sync
+Icon=gnome-ccwindowmanager.png
+Terminal=0
+Type=Application