If you are using GitLab outside of the ILL, then you will need to use HTTPS and not SSH for clone/push/pull operations. SSH will work normally if you are using the VPN.

Commit c664e88b authored by Tobias WEBER's avatar Tobias WEBER

removed old makefile

parent 61e3bde0
......@@ -59,19 +59,4 @@ Run program with
===============================================================================
Alternative building path
-------------------------
* Open "themakefile" in your favourite editor.
* Adapt the flags in the first few lines according to your system.
* Build Takin using "./build.sh"
* Run "./gentab" to create required tables
* Run Takin with "./takin".
===============================================================================
#!/bin/bash
#
# invokes "themakefile" (alternate build path)
# @author Tobias Weber <tobias.weber@tum.de>
# @license GPLv2
#
MAKE=make
GCC=$(which gcc 2>/dev/null)
SKIP_PREBUILD=0
if [ "$GCC" != "" ]
then
GCC_VER=$($GCC -dumpversion)
echo -e "GCC is version $GCC_VER"
GCC_VER=(${GCC_VER//./ })
fi
if [ ! -d tlibs ] || [ ! -f tlibs/AUTHORS ]
then
echo -e "Error: tlibs not installed."
exit -1;
fi
if [ "$SKIP_PREBUILD" == "0" ]
then
echo -e "Prebuilding..."
if ! ./prebuild.sh
then
echo -e "Error: Prebuild failed";
exit -1;
fi
fi
NPROC=$(which nproc 2>/dev/null)
if [ "$NPROC" == "" ]; then NPROC="/usr/bin/nproc"; fi
if [ ! -x $NPROC ]
then
CPUCNT=2
else
CPUCNT=$($NPROC --ignore=1)
fi
echo -e "\nBuilding using $CPUCNT processes..."
${MAKE} -j${CPUCNT} -f themakefile
......@@ -5,9 +5,27 @@
# @license GPLv2
#
echo -e "Cleaning stuff made by themakefile..."
make -f themakefile clean
find bin -regex 'bin/[_a-zA-Z0-9]*' | xargs rm -f
rm -f bin/*.exe
rm -f plugins/*.so
rm -f plugins/*.dll
rm -f obj/*.o
rm -f ui/*.h
rm -f *.moc
rm -f libs/*.moc
rm -f tools/taz/*.moc
rm -f tools/res/*.moc
rm -f tools/scanviewer/*.moc
rm -f tools/scanpos/*.moc
rm -f tools/powderfit/*.moc
rm -f tools/monteconvo/*.moc
rm -f tools/sglist/*.moc
rm -f dialogs/*.moc
rm -f doc/takin.qch
rm -f doc/takin.qhc
rm -rf doc/devel/html
rm -f doc/devel/*.tmp
if [ -f Makefile ]
then
......@@ -17,14 +35,3 @@ fi
rm -f CMakeCache.txt
rm -rf CMakeFiles
rm -f doc/takin.qch
rm -f doc/takin.qhc
rm -rf doc/devel/html
rm -f doc/devel/*.tmp
# restore link
#rm takin
#ln -sf bin/takin
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment