Update release script.

It is still messy, but does the trick...

contrib/qucs-release.sh

@@ -70,12 +70,11 @@ echo =================================
 echo Exporting git tree recursively...
 echo =================================
 
-# Recursive to clone also ADMS
-# only use submodule if different from upstream
-#git clone --recursive ./ release/
+# Clone only Qucs code (ADMS version handled below)
+git clone --recursive ./ release/
 
-# Clone only Qucs code, add ADMS from stable tarball
-git clone ./ release/
+#checkout ADMS version
+cd release/qucs-core/deps/adms/ && git checkout -b release-2.3.4 && cd -
 
 # flatten subdiretories
 mv release/examples release/qucs/examples/examples
@@ -180,31 +179,31 @@ aclocal
 cd ..
 
 
-# only use submodule if different from upstream
 #echo ========================
-#echo Bootstrap ADMS submodule
+#echo Checkout ADMS submodule
 #echo ========================
+#cd $REPO/release/qucs-$RELEASE
 #cd qucs-core/deps/adms
-#./bootstrap.sh
+#./bootstrap.sh  # skip bootstrap done by qucs-core
 #./configure --enable-maintainer-mode
-#make distcheck
+#make clean
+#make dist
 #rm -r adms-*.tar.gz
-#cd ../../..
 
-echo =========================
-echo Download and extract ADMS
-echo =========================
-cd $REPO/release/qucs-$RELEASE
-if [ -f ~/Downloads/adms-2.3.4.tar.gz ]
-then
-	cp ~/Downloads/adms-2.3.4.tar.gz .
-else
-  wget http://sourceforge.net/projects/mot-adms/files/adms-source/2.3/adms-2.3.4.tar.gz -P ~/Downloads/
-fi
-tar -zxvf adms-2.3.4.tar.gz
-mv adms-2.3.4 adms
-mv adms/* qucs-core/deps/adms/
-rm -r adms/
+#echo =================================
+#echo Download and extract ADMS tarball
+#echo =================================
+#cd $REPO/release/qucs-$RELEASE
+#if [ -f ~/Downloads/adms-2.3.4.tar.gz ]
+#then
+#	cp ~/Downloads/adms-2.3.4.tar.gz .
+#else
+#  wget http://sourceforge.net/projects/mot-adms/files/adms-source/2.3/adms-2.3.4.tar.gz -P ~/Downloads/
+#fi
+#tar -zxvf adms-2.3.4.tar.gz
+#mv adms-2.3.4 adms
+#mv adms/* qucs-core/deps/adms/
+#rm -r adms/
 
 
 echo ==================================
@@ -219,7 +218,7 @@ echo Bootstrap Qucs, Qucs-edit, Qucs-filter...
 echo =========================================
 cd $REPO/release/qucs-$RELEASE
 ./autogen.sh
-make distclean
+#make clean #no need
 rm -rf autom4te.cache
 #libtoolize
 case `uname` in
@@ -234,12 +233,33 @@ echo Bootstrap Qucs-core
 echo ===================
 cd qucs-core
 ./bootstrap.sh
+
+
+# TODO find a more elegant way to handle ADMS as a subproject, AC_CONFIG_SUBDIRS maybe?
+
+# fix libtool complaining
+cd deps/adms/
+#libtool: Version mismatch error.  This is libtool 2.4.5, but the
+#libtool: definition of this LT_INIT comes from libtool 2.4.2.
+#libtool: You should recreate aclocal.m4 with macros from libtool 2.4.5
+#libtool: and run autoconf again.
+glibtoolize && autoconf ## complaining about libtool versions (!)
+cd -
+
 ./configure --enable-maintainer-mode
-make
-./configure
-make distclean # Verilog-A sources are kept ??
+make       # build maintainer-mode Verilog-A C++ sources
+make clean # remove object code; this also removes the maintainer-mode files from the ADMS submodule (BUG!)
+#./configure
 rm -rf autom4te.cache
-cd ..
+
+# bootstrap ADMS once again
+cd deps/adms/
+./bootstrap.sh
+##glibtoolize && autoconf ## complaining about libtool versions (!)
+./configure --enable-maintainer-mode
+#make
+make dist
+rm -r adms-*.tar.gz
 
 
 echo ==========================
@@ -247,7 +267,7 @@ echo Creating source archive...
 echo ==========================
 cd $REPO/release/
 tar -zcvhf qucs-$RELEASE.tar.gz qucs-$RELEASE
-rm -rf qucs-$RELEASE
+#rm -rf qucs-$RELEASE
 tar -zxvf qucs-$RELEASE.tar.gz #make the symbolic links actual files