Unify the build process. Clean makefiles and add new icons

capplets/file-types/Makefile.am

@@ -32,9 +32,3 @@ Glade_DATA = $(cappletname)-properties.glade
 icons_DATA = $(cappletname)-capplet.png
 desktop    = $(cappletname).desktop
 all-local: $(desktop)
-
-
-
-
-
-

capplets/mime-type/Makefile.am

@@ -1,23 +1,30 @@
-INCLUDES = -I. -I$(srcdir) 				\
-	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
-	@CAPPLET_CFLAGS@
-
+cappletname = mime-type
+cappletgroup = "Advanced/"
 bin_PROGRAMS = mime-type-capplet
 
-mime_type_capplet_SOURCES = mime-type-capplet.c\
-	mime-data.h mime-data.c edit-window.c\
-	edit-window.h mime-info.c mime-info.h \
-	new-mime-window.h new-mime-window.c
+mime_type_capplet_LDADD = $(GNOMECC_CAPPLETS_LIBS)
+mime_type_capplet_SOURCES = \
+	mime-type-capplet.c\
+	mime-data.h		mime-data.c\
+	edit-window.c		edit-window.h\
+	mime-info.c		mime-info.h\
+	new-mime-window.h	new-mime-window.c
 
-mime_type_capplet_LDADD = @CAPPLET_LIBS@
+pixmap_DATA = 
 
-EXTRA_DIST = \
-	mime-type.desktop
+##
+## You should not need to modify anything below this line
+##
+@XML_I18N_MERGE_DESKTOP_RULE@
+@GNOMECC_CAPPLETS_DESKTOP_IN_RULE@
 
-
-sysdir = $(datadir)/control-center/capplets/Advanced/
-sys_DATA = mime-type.desktop 
-
-install-data-local:
-	$(INSTALL_DATA) $(srcdir)/mime-type.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Advanced/mime-type.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/mime-type/mime-type.desktop.in.in

@@ -0,0 +1,7 @@
+[Desktop Entry]
+_Name=Mime Types
+_Comment=Configure how files are associated and started
+Icon=mime-type-capplet.png
+Exec=mime-type-capplet
+Terminal=0
+Type=Application

capplets/url-properties/Makefile.am

@@ -1,21 +1,25 @@
-INCLUDES = -I. -I$(srcdir) 				\
-	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
-	-I$(srcdir)/../../libcapplet		\
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
-	@CAPPLET_CFLAGS@				\
-	-DGNOMESYSCONFDIR=\""$(sysconfdir)"\"
-
+cappletname = url
+cappletgroup = "Advanced/"
 bin_PROGRAMS = url-properties
 
+url_properties_LDADD = $(GNOMECC_CAPPLETS_LIBS)
 url_properties_SOURCES = url-properties.c
 
-url_properties_LDADD = @CAPPLET_LIBS@
+pixmap_DATA = 
 
-EXTRA_DIST = \
-	url-properties.desktop
+##
+## You should not need to modify anything below this line
+##
+@XML_I18N_MERGE_DESKTOP_RULE@
+@GNOMECC_CAPPLETS_DESKTOP_IN_RULE@
 
-sysdir = $(datadir)/control-center/Documents/
-sys_DATA = url-properties.desktop
-
-psysdir = $(datadir)/gnome/apps/Settings/Documents/
-psys_DATA = url-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/url-properties/url-properties_WITH_TRANSLATIONS

@@ -0,0 +1,57 @@
+[Desktop Entry]
+Name=URL Handlers
+Name[pt_BR]=Manipuladores de URL
+Name[cs]=Obsluha URL
+Name[ca]=Gestors d'URLs
+Name[da]=Url-håndterer
+Name[de]=Öffnen von URLs
+Name[el]=ÖõëëïìÝôñçóç URL
+Name[es]=Navegador de URLs
+Name[et]=URL käsitlejad
+Name[fi]=URL-käsittely
+Name[fr]=Gestionnaires d'URLs
+Name[gl]=Xestores de URL
+Name[hu]=URL kezelõk
+Name[it]=Gestori URL
+Name[ja]=URL¥Ï¥ó¥É¥é
+Name[ko]=URL ó¸®
+Name[no]=URL-håndtering
+Name[pl]=Obs³uga URL
+Name[pt]=URL Handlers 
+Name[ro]=Tratare URL-uri
+Name[ru]=ïÂÒÁÂÏÔÞÉËÉ URL
+Name[sl]=URL Upravniki
+Name[sv]=URL-hantering
+Name[tr]=URL yöneticileri
+Name[uk]=ïÂÒÏÂÎÉËÉ URL
+Name[wa]=Naivieu di hårdeyes (URLs)
+Comment=Configure which programs are used to display URLs
+Comment[pt_BR]=Configurar que programas são usados para mostrar URLs.
+Comment[cs]=Nastavení programù pro zobrazení URL
+Comment[ca]=Seleccionar quins programes usar per mostrar URLs.
+Comment[da]=Vælg hvilke programmer der skal bruges til at åbne url'er
+Comment[de]=Konfigurieren, womit URLs geöffnet werden
+Comment[el]=Ñõèìßæåé ðïéÜ ðñïãñÜììáôá èá äåß÷íïõí ôá URL
+Comment[es]=Configura cual programa usar para navegar por las URLs
+Comment[et]=Määrab, millised programmid käsitlevad milliseid URL protokolle
+Comment[fi]=Aseta, mitä ohjelmia käytetään URL:ien näyttämiseen
+Comment[fr]=Configuration des applications utilisées pour afficher les URLs
+Comment[gl]=Configura os programas que se van usar para amosar as URL
+Comment[hu]=A külömbözõ webhelyek-dokumentumok kezelésének beállítása
+Comment[it]=Impostazione dei programmi necessari per visualizzare le URL
+Comment[ja]=URL¤òɽ¼¨¤¹¤ë¥×¥í¥°¥é¥à¤ÎÀßÄê
+Comment[ko]=URLÀ» Ç¥½ÃÇÒ ¶§ »ç¿ëÇÒ ÇÁ·Î±×·¥ ¼±ÅÃ
+Comment[no]=Konfigurer hvilke programmer som brukes til å vise URL'er
+Comment[pl]=Konfiguracja programów do obs³ugi URL-i
+Comment[pt]=Permite configurar quais os programas usados para mostrar URLs
+Comment[ro]=Configuraþi ce programe sunt folosite pentru URL-uri
+Comment[ru]=ïÐÒÅÄÅÌÉÔØ ÐÒÏÇÒÁÍÍÕ ÄÌÑ ÐÏËÁÚÁ URL.
+Comment[sl]=Nastavi kateri programi naj se uporabijo za prikazovanje URLjev
+Comment[sv]=Konfigurera vilka program som används för att visa URL:er
+Comment[tr]=URL'leri gösterecek uygulamalarý belirtir
+Comment[uk]=÷ÉÚÎÁÞÅÎÎÑ ÐÒÏÇÒÁÍÉ ÄÌÑ ×¦ÄÏÂÒÁÖÅÎÎÑ URL
+Comment[wa]=Tchwezixhoz li programe ki vos voloz po naivyî sol rantoele daegnrece et po vey les hårdeyes
+Exec=url-properties
+Icon=gnome-html.png
+Terminal=0
+Type=Application

capplets/url-properties/url.desktop.in.in

@@ -0,0 +1,7 @@
+[Desktop Entry]
+_Name=URL Handlers
+_Comment=Configure which programs are used to display URLs
+Exec=url-properties
+Icon=gnome-html.png
+Terminal=0
+Type=Application

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