Attempt to fix #3499862 Errors with EXTRA_DIST.include or DIST_NOINST_JAVA.include

diff --git a/README b/README
index fee0597..d494316 100644 (file)
--- a/README
+++ b/README
@@ -2,7 +2,11 @@ Sudokuki - essential sudoku game
 
 -- Changelog --
 
-* 2012-02-23 - released Sudokuki 1.1 (Stable)
+* 2012-..... - released Sudokuki 1.1.1 (Stable)
+- #3493404 Final version of Portuguese translation for 1.1 realease.
+
+
+* 2012-02-23 - released Sudokuki 1.1.0 (Stable)
 - Greek translations (by Stavros Mavrakis)
 - Fixed aspect of two Cancel buttons
 - Fixed warnings and spurious traces

diff --git a/src/classes/DIST_NOINST_JAVA.include b/src/classes/DIST_NOINST_JAVA.include
index eb1f040..0f982ab 100644 (file)
--- a/src/classes/DIST_NOINST_JAVA.include
+++ b/src/classes/DIST_NOINST_JAVA.include
@@ -1,76 +1,76 @@
 dist_noinst_JAVA =  \
-net/jankenpoi/sudokuki/model/GridModel.java  \
+gnu/gettext/GettextResource.java  \
+net/jankenpoi/i18n/I18n.java  \
+net/jankenpoi/i18n/LocaleListener.java  \
+net/jankenpoi/sudokuki/controller/GridController.java  \
+net/jankenpoi/sudokuki/generator/SudokuGeneratorFactory.java  \
+net/jankenpoi/sudokuki/generator/SudokuGenerator.java  \
+net/jankenpoi/sudokuki/generator/suexg/SuexgGenerator.java  \
+net/jankenpoi/sudokuki/generator/suexg/SuexgJava.java  \
+net/jankenpoi/sudokuki/generator/suexg/SuexgProxy.java  \
 net/jankenpoi/sudokuki/model/GridChangedEvent.java  \
+net/jankenpoi/sudokuki/model/GridModel.java  \
 net/jankenpoi/sudokuki/model/Position.java  \
-net/jankenpoi/sudokuki/Version.java  \
+net/jankenpoi/sudokuki/preferences/UserPreferences.java  \
 net/jankenpoi/sudokuki/resources/UIResources.java  \
-net/jankenpoi/sudokuki/solver/GridSolver.java  \
-net/jankenpoi/sudokuki/solver/GridSolution.java  \
-net/jankenpoi/sudokuki/solver/GridShadow.java  \
 net/jankenpoi/sudokuki/solver/BruteForceGridSolver.java  \
-net/jankenpoi/sudokuki/preferences/UserPreferences.java  \
-net/jankenpoi/sudokuki/view/GridView.java  \
-net/jankenpoi/sudokuki/view/GridListener.java  \
-net/jankenpoi/sudokuki/controller/GridController.java  \
-net/jankenpoi/sudokuki/generator/suexg/SuexgProxy.java  \
-net/jankenpoi/sudokuki/generator/suexg/SuexgJava.java  \
-net/jankenpoi/sudokuki/generator/suexg/SuexgGenerator.java  \
-net/jankenpoi/sudokuki/generator/SudokuGeneratorFactory.java  \
-net/jankenpoi/sudokuki/generator/SudokuGenerator.java  \
+net/jankenpoi/sudokuki/solver/GridShadow.java  \
+net/jankenpoi/sudokuki/solver/GridSolution.java  \
+net/jankenpoi/sudokuki/solver/GridSolver.java  \
+net/jankenpoi/sudokuki/SudokuGrid.java  \
+net/jankenpoi/sudokuki/ui/L10nComponent.java  \
+net/jankenpoi/sudokuki/ui/Main.java  \
+net/jankenpoi/sudokuki/ui/MemosSelector.java  \
 net/jankenpoi/sudokuki/ui/Selector.java  \
-net/jankenpoi/sudokuki/ui/swing/SwingGrid.java  \
-net/jankenpoi/sudokuki/ui/swing/ToolBar.java  \
-net/jankenpoi/sudokuki/ui/swing/ResolveAction.java  \
-net/jankenpoi/sudokuki/ui/swing/PrintAction.java  \
-net/jankenpoi/sudokuki/ui/swing/MenuBar.java  \
-net/jankenpoi/sudokuki/ui/swing/PrintMultiAction.java  \
+net/jankenpoi/sudokuki/ui/swing/AboutAction.java  \
+net/jankenpoi/sudokuki/ui/swing/AboutDialog.java  \
+net/jankenpoi/sudokuki/ui/swing/ActionsRepository.java  \
+net/jankenpoi/sudokuki/ui/swing/CheatMenu.java  \
+net/jankenpoi/sudokuki/ui/swing/CheckUpdateAction.java  \
+net/jankenpoi/sudokuki/ui/swing/CheckUpdateDialog.java  \
+net/jankenpoi/sudokuki/ui/swing/ClearAllMovesAction.java  \
+net/jankenpoi/sudokuki/ui/swing/CustomGridAction.java  \
+net/jankenpoi/sudokuki/ui/swing/DualSelectionDialog.java  \
+net/jankenpoi/sudokuki/ui/swing/DualSwingSelector.java  \
+net/jankenpoi/sudokuki/ui/swing/EditMenu.java  \
+net/jankenpoi/sudokuki/ui/swing/EraseAllMemosAction.java  \
 net/jankenpoi/sudokuki/ui/swing/FileMenu.java  \
-net/jankenpoi/sudokuki/ui/swing/HelpMenu.java  \
 net/jankenpoi/sudokuki/ui/swing/GridGenerationDialog.java  \
-net/jankenpoi/sudokuki/ui/swing/TranslateDialog.java  \
-net/jankenpoi/sudokuki/ui/swing/DualSelectionDialog.java  \
-net/jankenpoi/sudokuki/ui/swing/PrintMultiDialog.java  \
+net/jankenpoi/sudokuki/ui/swing/HelpMenu.java  \
+net/jankenpoi/sudokuki/ui/swing/Images.java  \
+net/jankenpoi/sudokuki/ui/swing/LanguageDialog.java  \
+net/jankenpoi/sudokuki/ui/swing/LanguageMenu.java  \
+net/jankenpoi/sudokuki/ui/swing/LevelMenu.java  \
+net/jankenpoi/sudokuki/ui/swing/LocaleListenerImpl.java  \
+net/jankenpoi/sudokuki/ui/swing/MenuBar.java  \
+net/jankenpoi/sudokuki/ui/swing/NewGridAction.java  \
+net/jankenpoi/sudokuki/ui/swing/NewVersionFoundDialog.java  \
 net/jankenpoi/sudokuki/ui/swing/NumbersMenu.java  \
-net/jankenpoi/sudokuki/ui/swing/SelectNumberPanel.java  \
+net/jankenpoi/sudokuki/ui/swing/OpenGridAction.java  \
+net/jankenpoi/sudokuki/ui/swing/OpenUpdateSiteAction.java  \
 net/jankenpoi/sudokuki/ui/swing/PlayCustomGridAction.java  \
-net/jankenpoi/sudokuki/ui/swing/LanguageDialog.java  \
+net/jankenpoi/sudokuki/ui/swing/PrintAction.java  \
+net/jankenpoi/sudokuki/ui/swing/PrintMultiAction.java  \
+net/jankenpoi/sudokuki/ui/swing/PrintMultiDialog.java  \
 net/jankenpoi/sudokuki/ui/swing/QuitAction.java  \
-net/jankenpoi/sudokuki/ui/swing/ActionsRepository.java  \
-net/jankenpoi/sudokuki/ui/swing/EditMenu.java  \
-net/jankenpoi/sudokuki/ui/swing/OpenUpdateSiteAction.java  \
-net/jankenpoi/sudokuki/ui/swing/NewGridAction.java  \
-net/jankenpoi/sudokuki/ui/swing/DualSwingSelector.java  \
-net/jankenpoi/sudokuki/ui/swing/AboutAction.java  \
-net/jankenpoi/sudokuki/ui/swing/SetMemosHereAction.java  \
-net/jankenpoi/sudokuki/ui/swing/CustomGridAction.java  \
-net/jankenpoi/sudokuki/ui/swing/CheckUpdateDialog.java  \
-net/jankenpoi/sudokuki/ui/swing/LanguageMenu.java  \
-net/jankenpoi/sudokuki/ui/swing/SwingApp.java  \
-net/jankenpoi/sudokuki/ui/swing/Images.java  \
-net/jankenpoi/sudokuki/ui/swing/SwingView.java  \
-net/jankenpoi/sudokuki/ui/swing/CheckUpdateAction.java  \
+net/jankenpoi/sudokuki/ui/swing/ResolveAction.java  \
 net/jankenpoi/sudokuki/ui/swing/ResolveGridDialog.java  \
-net/jankenpoi/sudokuki/ui/swing/TranslateAction.java  \
-net/jankenpoi/sudokuki/ui/swing/OpenGridAction.java  \
-net/jankenpoi/sudokuki/ui/swing/LocaleListenerImpl.java  \
 net/jankenpoi/sudokuki/ui/swing/SaveAsAction.java  \
-net/jankenpoi/sudokuki/ui/swing/LevelMenu.java  \
-net/jankenpoi/sudokuki/ui/swing/EraseAllMemosAction.java  \
-net/jankenpoi/sudokuki/ui/swing/StockIcons.java  \
-net/jankenpoi/sudokuki/ui/swing/AboutDialog.java  \
-net/jankenpoi/sudokuki/ui/swing/SetAllMemosAction.java  \
-net/jankenpoi/sudokuki/ui/swing/CheatMenu.java  \
-net/jankenpoi/sudokuki/ui/swing/NewVersionFoundDialog.java  \
 net/jankenpoi/sudokuki/ui/swing/SelectMemosPanel.java  \
+net/jankenpoi/sudokuki/ui/swing/SelectNumberPanel.java  \
+net/jankenpoi/sudokuki/ui/swing/SetAllMemosAction.java  \
+net/jankenpoi/sudokuki/ui/swing/SetMemosHereAction.java  \
+net/jankenpoi/sudokuki/ui/swing/StockIcons.java  \
+net/jankenpoi/sudokuki/ui/swing/SwingApp.java  \
+net/jankenpoi/sudokuki/ui/swing/SwingGrid.java  \
 net/jankenpoi/sudokuki/ui/swing/SwingMultiGrid.java  \
-net/jankenpoi/sudokuki/ui/swing/ClearAllMovesAction.java  \
-net/jankenpoi/sudokuki/ui/MemosSelector.java  \
-net/jankenpoi/sudokuki/ui/L10nComponent.java  \
-net/jankenpoi/sudokuki/ui/UIApp.java  \
-net/jankenpoi/sudokuki/ui/Main.java  \
-net/jankenpoi/sudokuki/ui/text/TextView.java  \
+net/jankenpoi/sudokuki/ui/swing/SwingView.java  \
+net/jankenpoi/sudokuki/ui/swing/ToolBar.java  \
+net/jankenpoi/sudokuki/ui/swing/TranslateAction.java  \
+net/jankenpoi/sudokuki/ui/swing/TranslateDialog.java  \
 net/jankenpoi/sudokuki/ui/TestApp.java  \
-net/jankenpoi/sudokuki/SudokuGrid.java  \
-net/jankenpoi/i18n/LocaleListener.java  \
-net/jankenpoi/i18n/I18n.java  \
-gnu/gettext/GettextResource.java
+net/jankenpoi/sudokuki/ui/text/TextView.java  \
+net/jankenpoi/sudokuki/ui/UIApp.java  \
+net/jankenpoi/sudokuki/Version.java  \
+net/jankenpoi/sudokuki/view/GridListener.java  \
+net/jankenpoi/sudokuki/view/GridView.java

diff --git a/src/classes/Makefile.am b/src/classes/Makefile.am
index ef4085d..5c385ef 100644 (file)
--- a/src/classes/Makefile.am
+++ b/src/classes/Makefile.am
@@ -28,7 +28,7 @@ mkoutputdir:
 updateAndCheckJavaFilesList:
        rm $(JAVASRCDIR)/new_DIST_NOINST_JAVA.include; \
        line="dist_noinst_JAVA = "; \
-       for next in `find $(JAVASRCDIR) -name "*.java" && echo "THE_END"` ; do \
+       for next in `find $(JAVASRCDIR) -name "*.java" | sort && echo "THE_END"` ; do \
          if test "$$next" != "THE_END"; then \
            echo $$line" \\" >> $(JAVASRCDIR)/new_DIST_NOINST_JAVA.include; \
            line=`echo "$$next" | sed "s/^.*src\/classes\/\(.*\)/\1 /"` ; \
@@ -37,7 +37,9 @@ updateAndCheckJavaFilesList:
          fi; \
        done; \
        if test -f $(JAVASRCDIR)/DIST_NOINST_JAVA.include; then \
-          cmp -s $(JAVASRCDIR)/DIST_NOINST_JAVA.include $(JAVASRCDIR)/new_DIST_NOINST_JAVA.include; \
+          cat $(JAVASRCDIR)/DIST_NOINST_JAVA.include | grep -v EXTRA_DIST | sed "s/\ \ \\\//" > $(JAVASRCDIR)/4diff_DIST_NOINST_JAVA.include; \
+          cat $(JAVASRCDIR)/new_DIST_NOINST_JAVA.include | grep -v EXTRA_DIST | sed "s/\ \ \\\//" > $(JAVASRCDIR)/4diff_new_DIST_NOINST_JAVA.include; \
+          cmp -s $(JAVASRCDIR)/4diff_new_DIST_NOINST_JAVA.include $(JAVASRCDIR)/4diff_DIST_NOINST_JAVA.include; \
           RETVAL=$$?; \
           if test "$$RETVAL" = "0" ; then \
             echo ""; \

diff --git a/src/resources/EXTRA_DIST.include b/src/resources/EXTRA_DIST.include
index d89778c..eabde2b 100644 (file)
--- a/src/resources/EXTRA_DIST.include
+++ b/src/resources/EXTRA_DIST.include
@@ -1,54 +1,54 @@
 EXTRA_DIST =  \
-files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/media-playback-start-ltr.png  \
-files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/view-refresh-update-available.png  \
-files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/go-jump-ltr.png  \
-files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/list-add.png  \
-files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/document-print.png  \
-files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/set-all-memos.png  \
-files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/edit-clear.png  \
-files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/gtk-preferences.png  \
-files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/application-exit.png  \
-files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/gtk-font.png  \
-files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/printer-info.png  \
-files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/image-missing.png  \
-files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/solution-menu.png  \
-files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/view-refresh.png  \
-files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/go-next-ltr.png  \
-files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/network-idle.png  \
-files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/tools-check-spelling.png  \
-files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/edit-undo-ltr.png  \
-files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/document-open.png  \
-files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/help-about.png  \
-files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/set-memos-here.png  \
-files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/erase-all-memos.png  \
-files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/gtk-edit.png  \
-files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/document-save-as.png  \
-files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/go-home.png  \
-files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/document-new.png  \
-files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/earth.png  \
-files/net/jankenpoi/sudokuki/resources/images/countryFlags/xx.png  \
-files/net/jankenpoi/sudokuki/resources/images/countryFlags/fr.png  \
-files/net/jankenpoi/sudokuki/resources/images/countryFlags/el.png  \
+files/net/jankenpoi/i18n/sudokuki_de.properties  \
+files/net/jankenpoi/i18n/sudokuki_el.properties  \
+files/net/jankenpoi/i18n/sudokuki_en.properties  \
+files/net/jankenpoi/i18n/sudokuki_eo.properties  \
+files/net/jankenpoi/i18n/sudokuki_es.properties  \
+files/net/jankenpoi/i18n/sudokuki_fr.properties  \
+files/net/jankenpoi/i18n/sudokuki_ja.properties  \
+files/net/jankenpoi/i18n/sudokuki_pt.properties  \
+files/net/jankenpoi/i18n/sudokuki_ru.properties  \
+files/net/jankenpoi/i18n/sudokuki_zh.properties  \
 files/net/jankenpoi/sudokuki/resources/images/countryFlags/de.png  \
+files/net/jankenpoi/sudokuki/resources/images/countryFlags/el.png  \
 files/net/jankenpoi/sudokuki/resources/images/countryFlags/en.png  \
-files/net/jankenpoi/sudokuki/resources/images/countryFlags/pt.png  \
-files/net/jankenpoi/sudokuki/resources/images/countryFlags/ja.png  \
 files/net/jankenpoi/sudokuki/resources/images/countryFlags/eo.png  \
 files/net/jankenpoi/sudokuki/resources/images/countryFlags/es.png  \
+files/net/jankenpoi/sudokuki/resources/images/countryFlags/fr.png  \
+files/net/jankenpoi/sudokuki/resources/images/countryFlags/ja.png  \
+files/net/jankenpoi/sudokuki/resources/images/countryFlags/pt.png  \
 files/net/jankenpoi/sudokuki/resources/images/countryFlags/ru.png  \
+files/net/jankenpoi/sudokuki/resources/images/countryFlags/xx.png  \
 files/net/jankenpoi/sudokuki/resources/images/countryFlags/zh.png  \
+files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/application-exit.png  \
+files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/document-new.png  \
+files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/document-open.png  \
+files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/document-print.png  \
+files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/document-save-as.png  \
+files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/earth.png  \
+files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/edit-clear.png  \
+files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/edit-undo-ltr.png  \
+files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/erase-all-memos.png  \
+files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/go-home.png  \
+files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/go-jump-ltr.png  \
+files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/go-next-ltr.png  \
+files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/gtk-edit.png  \
+files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/gtk-font.png  \
+files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/gtk-preferences.png  \
+files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/help-about.png  \
+files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/image-missing.png  \
+files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/list-add.png  \
+files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/media-playback-start-ltr.png  \
+files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/network-idle.png  \
+files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/printer-info.png  \
+files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/set-all-memos.png  \
+files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/set-memos-here.png  \
+files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/solution-menu.png  \
+files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/tools-check-spelling.png  \
+files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/view-refresh.png  \
+files/net/jankenpoi/sudokuki/resources/images/gtk+/stock-icons/16/view-refresh-update-available.png  \
 files/net/jankenpoi/sudokuki/resources/images/logo.png  \
-files/net/jankenpoi/sudokuki/resources/images/sudokuki_icon.png  \
 files/net/jankenpoi/sudokuki/resources/images/logo_small.png  \
+files/net/jankenpoi/sudokuki/resources/images/sudokuki_icon.png  \
 files/net/jankenpoi/sudokuki/resources/text/COPYING  \
-files/net/jankenpoi/sudokuki/resources/text/COPYING.html  \
-files/net/jankenpoi/i18n/sudokuki_en.properties  \
-files/net/jankenpoi/i18n/sudokuki_eo.properties  \
-files/net/jankenpoi/i18n/sudokuki_fr.properties  \
-files/net/jankenpoi/i18n/sudokuki_ru.properties  \
-files/net/jankenpoi/i18n/sudokuki_es.properties  \
-files/net/jankenpoi/i18n/sudokuki_de.properties  \
-files/net/jankenpoi/i18n/sudokuki_pt.properties  \
-files/net/jankenpoi/i18n/sudokuki_zh.properties  \
-files/net/jankenpoi/i18n/sudokuki_ja.properties  \
-files/net/jankenpoi/i18n/sudokuki_el.properties
+files/net/jankenpoi/sudokuki/resources/text/COPYING.html

diff --git a/src/resources/Makefile.am b/src/resources/Makefile.am
index 04fec94..cc3cb3c 100644 (file)
--- a/src/resources/Makefile.am
+++ b/src/resources/Makefile.am
@@ -14,7 +14,7 @@ $(EXTRA_DIST): updateAndCheckExtraDistFilesList
 updateAndCheckExtraDistFilesList:
        rm $(RESOURCESDIR)/new_EXTRA_DIST.include; \
        line="EXTRA_DIST = "; \
-       for next in `find $(RESOURCESDIR)/files -type f | grep -v ".svn" && echo "THE_END"` ; do \
+       for next in `find $(RESOURCESDIR)/files -type f | grep -v ".svn" | sort && echo "THE_END"` ; do \
          if test "$$next" != "THE_END"; then \
            echo $$line" \\" >> $(RESOURCESDIR)/new_EXTRA_DIST.include; \
            line=`echo "$$next" | sed "s/^.*src\/resources\/\(.*\)/\1 /"` ; \
@@ -23,19 +23,21 @@ updateAndCheckExtraDistFilesList:
          fi; \
        done; \
        if test -f $(RESOURCESDIR)/EXTRA_DIST.include; then \
-       cmp -s $(RESOURCESDIR)/new_EXTRA_DIST.include $(RESOURCESDIR)/EXTRA_DIST.include; \
-       RETVAL=$$?; \
-       if test "$$RETVAL" = "0" ; then \
-         echo ""; \
-         echo "*** EXTRA_DIST.include is up-to-date"; \
-         echo ""; \
-       else \
-         echo ""; \
-         echo "*** The control file 'EXTRA_DIST.include' needs to be updated first!"; \
-         echo "*** Replace it with 'new_EXTRA_DIST.include' and try again."; \
-         echo ""; \
-         exit 1; \
-       fi; \
+         cat $(RESOURCESDIR)/EXTRA_DIST.include | grep -v EXTRA_DIST | sed "s/\ \ \\\//" > $(RESOURCESDIR)/4diff_EXTRA_DIST.include; \
+         cat $(RESOURCESDIR)/new_EXTRA_DIST.include | grep -v EXTRA_DIST | sed "s/\ \ \\\//" > $(RESOURCESDIR)/4diff_new_EXTRA_DIST.include; \
+         cmp -s $(RESOURCESDIR)/4diff_new_EXTRA_DIST.include $(RESOURCESDIR)/4diff_EXTRA_DIST.include; \
+         RETVAL=$$?; \
+         if test "$$RETVAL" = "0" ; then \
+           echo ""; \
+           echo "*** EXTRA_DIST.include is up-to-date"; \
+           echo ""; \
+         else \
+           echo ""; \
+           echo "*** The control file 'EXTRA_DIST.include' needs to be updated first!"; \
+           echo "*** Replace it with 'new_EXTRA_DIST.include' and try again."; \
+           echo ""; \
+           exit 1; \
+         fi; \
        fi
 
 CLEANFILES = new_EXTRA_DIST.include