From d838f44e3cdcd47c2bfbb916ac4de3e95d12dc84 Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Sat, 8 Dec 2012 15:45:17 +0100
Subject: [PATCH] Make automake distcheck ready

---
 autogen.sh                                 | 33 +++++++++++++---------
 src/Mod/Part/Gui/Makefile.am               |  3 ++
 src/Mod/PartDesign/Gui/Makefile.am         |  3 +-
 src/Mod/Sketcher/Gui/Resources/Makefile.am |  2 ++
 4 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index cdc7f74d1..6c410b02f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,25 +4,30 @@
 
 # Get version and revision number
 MAJ=0
-MIN=12
+MIN=13
 REV=0
 
-if svn --xml info >/dev/null 2>&1; then
-	REV=`svn --xml info | tr -d '\r\n' | sed -e 's/.*<commit.*revision="\([0-9]*\)".*<\/commit>.*/\1/'`
-elif svn --version --quiet >/dev/null 2>&1; then
-	REV=`svn info | grep "^Revision:" | cut -d" " -f2`
-fi
+#if svn --xml info >/dev/null 2>&1; then
+#	REV=`svn --xml info | tr -d '\r\n' | sed -e 's/.*<commit.*revision="\([0-9]*\)".*<\/commit>.*/\1/'`
+#elif svn --version --quiet >/dev/null 2>&1; then
+#	REV=`svn info | grep "^Revision:" | cut -d" " -f2`
+#fi
+# count all lines that don't match this string
+REV=`git rev-list HEAD | grep -cv "*"`
 
 # if revision.m4 does not exist, create it
 REV_FILE=revision.m4
-if [ -f $REV_FILE ]; then
-	echo "$REV_FILE found"
-else
-	echo "m4_define([FREECAD_MAJOR], $MAJ)" > $REV_FILE
-	echo "m4_define([FREECAD_MINOR], $MIN)" >> $REV_FILE
-	echo "m4_define([FREECAD_MICRO], $REV)" >> $REV_FILE
-	echo "$REV_FILE created"
-fi
+#if [ -f $REV_FILE ]; then
+#	echo "$REV_FILE found"
+#else
+#	echo "m4_define([FREECAD_MAJOR], $MAJ)" > $REV_FILE
+#	echo "m4_define([FREECAD_MINOR], $MIN)" >> $REV_FILE
+#	echo "m4_define([FREECAD_MICRO], $REV)" >> $REV_FILE
+#	echo "$REV_FILE created"
+#fi
+echo "m4_define([FREECAD_MAJOR], $MAJ)" > $REV_FILE
+echo "m4_define([FREECAD_MINOR], $MIN)" >> $REV_FILE
+echo "m4_define([FREECAD_MICRO], $REV)" >> $REV_FILE
 
 # create m4 subdirectory which fails for some older versions of autotools
 [ -d m4 ] || mkdir m4
diff --git a/src/Mod/Part/Gui/Makefile.am b/src/Mod/Part/Gui/Makefile.am
index 757950d10..edd40b00d 100644
--- a/src/Mod/Part/Gui/Makefile.am
+++ b/src/Mod/Part/Gui/Makefile.am
@@ -210,6 +210,7 @@ EXTRA_DIST = \
 		Resources/icons/Part_CreatePrimitives.png \
 		Resources/icons/Part_CreatePrimitives.svg \
 		Resources/icons/Part_Fuse.svg \
+		Resources/icons/Part_CrossSections.svg \
 		Resources/icons/Part_Section.svg \
 		Resources/icons/Part_Extrude.svg \
 		Resources/icons/Part_Fillet.svg \
@@ -218,11 +219,13 @@ EXTRA_DIST = \
 		Resources/icons/Part_Loft.svg \
 		Resources/icons/Part_Mirror.svg \
 		Resources/icons/Part_MirrorPNG.png \
+		Resources/icons/Part_Offset.svg \
 		Resources/icons/Part_RuledSurface.svg \
 		Resources/icons/Part_Shapebuilder.png \
 		Resources/icons/Part_Shapebuilder.svg \
 		Resources/icons/Part_ShapeInfo.svg \
 		Resources/icons/Part_Sweep.svg \
+		Resources/icons/Part_Thickness.svg \
 		Resources/icons/Tree_Part.svg \
 		Resources/icons/preferences-part_design.svg \
 		Resources/icons/PartFeature.svg \
diff --git a/src/Mod/PartDesign/Gui/Makefile.am b/src/Mod/PartDesign/Gui/Makefile.am
index cddbc86a8..6f84728ad 100644
--- a/src/Mod/PartDesign/Gui/Makefile.am
+++ b/src/Mod/PartDesign/Gui/Makefile.am
@@ -41,6 +41,7 @@ libPartDesignGui_la_UI=\
 		TaskPadParameters.ui \
 		TaskPocketParameters.ui \
 		TaskChamferParameters.ui \
+		TaskDraftParameters.ui \
 		TaskFilletParameters.ui \
 		TaskFilletParameters.ui \
 		TaskHoleParameters.ui \
@@ -72,7 +73,7 @@ libPartDesignGui_la_SOURCES=\
 		TaskFilletParameters.cpp \
 		TaskFilletParameters.h \
 		TaskDraftParameters.cpp \
-                TaskDraftParameters.h \
+		TaskDraftParameters.h \
 		TaskLinearPatternParameters.cpp \
 		TaskLinearPatternParameters.h \
 		TaskMirroredParameters.cpp \
diff --git a/src/Mod/Sketcher/Gui/Resources/Makefile.am b/src/Mod/Sketcher/Gui/Resources/Makefile.am
index 04437ed4f..abb54c947 100644
--- a/src/Mod/Sketcher/Gui/Resources/Makefile.am
+++ b/src/Mod/Sketcher/Gui/Resources/Makefile.am
@@ -72,7 +72,9 @@ icons/Constraint_PointOnObject.svg \
 		icons/Sketcher_Trimming.svg \
 		icons/Sketcher_External.svg \
 		icons/Sketcher_LeaveSketch.svg \
+		icons/Sketcher_MapSketch.svg \
 		icons/Sketcher_NewSketch.svg \
+		icons/Sketcher_ViewSketch.svg \
 		icons/Sketcher_Sketch.svg \
 		translations/Sketcher_af.qm \
 		translations/Sketcher_af.ts \