From 26b8e06374c71e42be86694f5d5c4ee920ae4d26 Mon Sep 17 00:00:00 2001
From: Alex Bennee <alex@bennee.com>
Date: Wed, 14 Jul 2010 16:01:16 +0100
Subject: EasyTag 2.1.4

---
 Makefile.am | 89 +++++++++++--------------------------------------------------
 1 file changed, 15 insertions(+), 74 deletions(-)
 mode change 100644 => 100755 Makefile.am

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
old mode 100644
new mode 100755
index 6b1f6a6..4a58ab1
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,10 +11,11 @@ text_DATA = ChangeLog
 man_MANS = doc/easytag.1
 
 BITMAPS = \
-    pixmaps/add.xpm \
     pixmaps/add_folder.xpm \
+    pixmaps/album.xpm \
     pixmaps/all_downcase.xpm \
     pixmaps/all_uppercase.xpm \
+    pixmaps/artist.xpm \
     pixmaps/artist_album.xpm \
     pixmaps/black.xpm \
     pixmaps/blackwhite.xpm \
@@ -47,10 +48,15 @@ BITMAPS = \
 pixmapdir = $(datadir)/$(PACKAGE)
 pixmap_DATA = \
     pixmaps/EasyTAG_logo.xpm
+#    pixmaps/artist_album.png \
+#    pixmaps/EasyTAG_icon.png \
+#    pixmaps/EasyTAG_logo.png \
+#    pixmaps/scan.png
 
 
 icondir = $(datadir)/pixmaps
 icon_DATA = pixmaps/EasyTAG_icon.xpm
+#icon_DATA = pixmaps/EasyTAG_icon.png
 
 
 EXTRA_DIST= \
@@ -62,7 +68,7 @@ EXTRA_DIST= \
     \
     autogen.sh \
     easytag.spec \
-    easytag.win32.setup.iss \
+    easytag-win32-installer.nsi \
     COPYING \
     INSTALL \
     README \
@@ -87,75 +93,10 @@ EXTRA_DIST= \
     po/Makefile.mingw \
     \
     doc/easytag.1.in \
-    doc/EasyTAG_Documentation.html \
-    doc/EasyTAG_Documentation_fr.html \
-    doc/EasyTAG_Documentation_sv.html \
-    doc/users_guide_french/USERS-GUIDE-11_fr1.html \
-    doc/users_guide_french/USERS-GUIDE-11_fr2.html \
-    doc/users_guide_french/USERS-GUIDE-11_fr3.html \
-    doc/users_guide_french/USERS-GUIDE-11_fr4.html \
-    doc/users_guide_french/USERS-GUIDE-11_fr5.html \
-    doc/users_guide_french/USERS-GUIDE-11_fr6.html \
-    doc/users_guide_french/USERS-GUIDE.css \
-    doc/users_guide_french/images/bouton_arbo.png \
-    doc/users_guide_french/images/bouton_img1.png \
-    doc/users_guide_french/images/bouton_img2.png \
-    doc/users_guide_french/images/bouton_img3.png \
-    doc/users_guide_french/images/bouton_scan1.png \
-    doc/users_guide_french/images/bouton_scan2.png \
-    doc/users_guide_french/images/bouton_scan3.png \
-    doc/users_guide_french/images/bouton_scan4.png \
-    doc/users_guide_french/images/bouton_scan5.png \
-    doc/users_guide_french/images/bouton_scan6.png \
-    doc/users_guide_french/images/bouton_scan7.png \
-    doc/users_guide_french/images/fen_boutons.png \
-    doc/users_guide_french/images/fen_cddb1.png \
-    doc/users_guide_french/images/fen_cddb2.png \
-    doc/users_guide_french/images/fen_fic_txt.png \
-    doc/users_guide_french/images/fen_fich.png \
-    doc/users_guide_french/images/fen_lect1.png \
-    doc/users_guide_french/images/fen_lect2.png \
-    doc/users_guide_french/images/fen_playlist.png \
-    doc/users_guide_french/images/fen_rech1.png \
-    doc/users_guide_french/images/fen_scan1.png \
-    doc/users_guide_french/images/fen_scan2.png \
-    doc/users_guide_french/images/fen_scan3.png \
-    doc/users_guide_french/images/fen_scan4.png \
-    doc/users_guide_french/images/fen_sel1.png \
-    doc/users_guide_french/images/fen_sel2.png \
-    doc/users_guide_french/images/fen_sel3.png \
-    doc/users_guide_french/images/fen_tag_bout1.png \
-    doc/users_guide_french/images/fen_tag_bout2.png \
-    doc/users_guide_french/images/fen_tag_gen.png \
-    doc/users_guide_french/images/fen_tag_img.png \
-    doc/users_guide_french/images/interface.png \
-    doc/users_guide_french/images/menu_context1.png \
-    doc/users_guide_french/images/menu_context2.png \
-    doc/users_guide_french/images/menu_context3.png \
-    doc/users_guide_french/images/menu_div.png \
-    doc/users_guide_french/images/menu_fic.png \
-    doc/users_guide_french/images/menu_pref.png \
-    doc/users_guide_french/images/menu_recherche1.png \
-    doc/users_guide_french/images/menu_recherche2.png \
-    doc/users_guide_french/images/menu_recherche.png \
-    doc/users_guide_french/images/menu_scan.png \
-    doc/users_guide_french/images/menu_sel.png \
-    doc/users_guide_french/images/sousmenu_fic1.png \
-    doc/users_guide_french/images/sousmenu_fic2.png \
-    doc/users_guide_german/bedienung1.htm \
-    doc/users_guide_german/bedienung2.htm \
-    doc/users_guide_german/easy.css \
-    doc/users_guide_german/einleitung.htm\
-    doc/users_guide_german/images/EasyTAG.png \
-    doc/users_guide_german/images/filelist.png \
-    doc/users_guide_german/images/playlist.png \
-    doc/users_guide_german/images/t_easytag.jpg \
-    doc/users_guide_german/images/eigensch.png \
-    doc/users_guide_german/images/search.png \
-    doc/users_guide_german/images/treeview.png \
-    doc/id3/easy.html \
-    doc/id3/id3v2.3.0.html \
-    doc/id3/id3v2_blocks.gif \
-    doc/id3/mpeghdr-19991222.htm \
-    doc/vorbis/v-comment.html \
-    doc/vorbis/white-ogg.png
+    doc/EasyTAG_Documentation*.html \
+    doc/users_guide_*/* \
+    doc/users_guide_*/images/* \
+    doc/id3/* \
+    doc/vorbis/* 
+
+
-- 
cgit v1.2.3