rename qmake to tqmakefeat/tqmake

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

1 files changed, 57 insertions, 57 deletions

diff --git a/configure b/configure
index 92bdf2227..283522d72 100755
--- a/configure
+++ b/configure
@@ -784,7 +784,7 @@ while [ "$#" -gt 0 ]; do
 	;;
     v|verbose)
 	if [ "$VAL" = "yes" ]; then
-	    if [ "$OPT_VERBOSE" = "$VAL" ]; then 	    # takes two verboses to turn on qmake debugs
+	    if [ "$OPT_VERBOSE" = "$VAL" ]; then 	    # takes two verboses to turn on tqmake debugs
 		QMAKE_SWITCHES="$QMAKE_SWITCHES -d"
             else
 		OPT_VERBOSE=yes
@@ -928,19 +928,19 @@ WHICH=$unixtests/which.test
 ### skip this if the user just needs help...
 if [ "$OPT_HELP" != "yes" ]; then
 
-# create the include and include/qmake directory (for tqconfig.h and tqmodules.h)
-[ -d $outpath/include/qmake ] || mkdir -p $outpath/include/qmake
+# create the include and include/tqmake directory (for tqconfig.h and tqmodules.h)
+[ -d $outpath/include/tqmake ] || mkdir -p $outpath/include/tqmake
 
-# create temporary tqconfig.h for compiling qmake
-# when building qmake, we use #defines for the install paths,
+# create temporary tqconfig.h for compiling tqmake
+# when building tqmake, we use #defines for the install paths,
 # however they are real functions in the library
-cat >>$outpath/include/qmake/tqconfig.h <<EOF
-/* All features enabled while building qmake */
+cat >>$outpath/include/tqmake/tqconfig.h <<EOF
+/* All features enabled while building tqmake */
 EOF
 
-# create temporary tqmodules.h for compiling qmake
-cat >>$outpath/include/qmake/tqmodules.h <<EOF
-/* All modules enabled while building qmake */
+# create temporary tqmodules.h for compiling tqmake
+cat >>$outpath/include/tqmake/tqmodules.h <<EOF
+/* All modules enabled while building tqmake */
 EOF
 
 # is this a shadow build?
@@ -1005,8 +1005,8 @@ if [ "$OPT_SHADOW" = "yes" ]; then
 	exit 1
     fi
 
-    # symlink the qmake directory
-    for a in `find $relpath/qmake`; do
+    # symlink the tqmake directory
+    for a in `find $relpath/tqmake`; do
 	my_a=`echo $a | sed "s,^${relpath}/,${outpath}/,"`
 	if [ '!' -f $my_a ]; then
 	    if [ -d $a ]; then
@@ -1017,7 +1017,7 @@ if [ "$OPT_SHADOW" = "yes" ]; then
 		[ -d $a_dir ] || mkdir -p $a_dir
 		# ... and files are symlinked
 		case `basename $a` in
-		*.o|*.d|GNUmakefile*|qmake)
+		*.o|*.d|GNUmakefile*|tqmake)
 		    ;;
 		*)
 		    rm -f $my_a
@@ -1309,15 +1309,15 @@ if [ '!' -f "${XQMAKESPEC}/qplatformdefs.h" ]; then
 fi
 
 # now look at the configs and figure out what platform we are config'd for
-[ '!' -z "`grep QMAKE_LIBS_X11 $XQMAKESPEC/qmake.conf | awk '{print $3;}'`" ] && PLATFORM_X11=yes
+[ '!' -z "`grep QMAKE_LIBS_X11 $XQMAKESPEC/tqmake.conf | awk '{print $3;}'`" ] && PLATFORM_X11=yes
 
 # find default thread option for target
-if grep >/dev/null '^QMAKE_LIBS_THREAD' $XQMAKESPEC/qmake.conf; then
+if grep >/dev/null '^QMAKE_LIBS_THREAD' $XQMAKESPEC/tqmake.conf; then
     AUTOTHREAD=yes
 else
     AUTOTHREAD=never
 fi
-# common qmake.conf file but dependency on OS version
+# common tqmake.conf file but dependency on OS version
 if [ "$UNAME_SYSTEM" = "HP-UX" ]; then
     if echo $UNAME_RELEASE | grep -E "^B\.(09|10)" >/dev/null 2>&1; then
 	AUTOTHREAD=never
@@ -1326,15 +1326,15 @@ fi
 if [ "$UNAME_SYSTEM" = "SunOS" ]; then
     # Solaris 2.5 and 2.6 have libposix4, which was renamed to librt for Solaris >=7
     if echo $UNAME_RELEASE | grep "^5\.[5|6]" >/dev/null 2>&1; then
-	sed -e "s,-lrt,-lposix4," $XQMAKESPEC/qmake.conf > $XQMAKESPEC/qmake.conf.new
-	mv $XQMAKESPEC/qmake.conf.new $XQMAKESPEC/qmake.conf
+	sed -e "s,-lrt,-lposix4," $XQMAKESPEC/tqmake.conf > $XQMAKESPEC/tqmake.conf.new
+	mv $XQMAKESPEC/tqmake.conf.new $XQMAKESPEC/tqmake.conf
     fi
 fi
 if [ $AUTOTHREAD = never ]; then
     if [ "$CFG_THREAD" = "yes" ]; then
 	echo
 	echo "ERROR: TQt is not configured to support threading on this platform"
-	echo "       See the THREAD settings in $XQMAKESPEC/qmake.conf"
+	echo "       See the THREAD settings in $XQMAKESPEC/tqmake.conf"
 	echo
 	exit 2
     fi
@@ -1344,7 +1344,7 @@ fi
 
 
 #-------------------------------------------------------------------------------
-# tests that don't need qmake (must be run before displaying help)
+# tests that don't need tqmake (must be run before displaying help)
 #-------------------------------------------------------------------------------
 
 # auto-detect precompiled header support
@@ -1766,7 +1766,7 @@ Configure options:
 
     -fast .............. Configure TQt quickly by generating Makefiles only for
 			 library and subdirectory targets.  All other Makefiles
-			 are created as wrappers, which will in turn run qmake.
+			 are created as wrappers, which will in turn run tqmake.
  *  -no-fast ........... Configure TQt normally by generating Makefiles for all
 			 project files.
 
@@ -2058,7 +2058,7 @@ irix-cc*)
 esac
 
 # -----------------------------------------------------------------------------
-# build qmake
+# build tqmake
 # -----------------------------------------------------------------------------
 
 # symlink includes
@@ -2073,9 +2073,9 @@ if [ "$OPT_SHADOW" = "yes" ]; then
     QMAKE_VARS="$QMAKE_VARS \"INCLUDEPATH+=${outpath}/include\""
 fi
 
-# build qmake
+# build tqmake
 if true; then ###[ '!' -f "$outpath/bin/tqmake" ];
-    echo "Creating qmake. Please wait..."
+    echo "Creating tqmake. Please wait..."
     rm -f mkspecs/default
     ln -s `echo $QMAKESPEC | sed "s,^${relpath}/mkspecs/,,"` mkspecs/default
     # fix makefiles
@@ -2084,13 +2084,13 @@ if true; then ###[ '!' -f "$outpath/bin/tqmake" ];
 	EXTRA_CFLAGS=
 	in_mkfile="${mkfile}.in"
 	if [ "$mkfile" = "Makefile" ]; then
-#	    if which qmake >/dev/null 2>&1 && [ -f qmake/qmake.pro ]; then
-#		(cd qmake && qmake) >/dev/null 2>&1 && continue
+#	    if which tqmake >/dev/null 2>&1 && [ -f tqmake/tqmake.pro ]; then
+#		(cd tqmake && tqmake) >/dev/null 2>&1 && continue
 #	    fi
 	    in_mkfile="${mkfile}.unix"
 	fi
-	in_mkfile="$relpath/qmake/$in_mkfile"
-	mkfile="$outpath/qmake/$mkfile"
+	in_mkfile="$relpath/tqmake/$in_mkfile"
+	mkfile="$outpath/tqmake/$mkfile"
 	if [ -f "$mkfile" ]; then
 	    [ "$Edition" = "troll" ] && $WHICH chflags >/dev/null 2>&1 && chflags nouchg $mkfile
 	    rm -f $mkfile
@@ -2103,19 +2103,19 @@ if true; then ###[ '!' -f "$outpath/bin/tqmake" ];
         EXTRA_CFLAGS="\$(QMAKE_CFLAGS)"
         EXTRA_CXXFLAGS="\$(QMAKE_CXXFLAGS)"
         EXTRA_LFLAGS="\$(QMAKE_LFLAGS)"
-	grep "^QMAKE_CC[^_A-Z0-9]" $QMAKESPEC/qmake.conf | sed "s,QMAKE_CC,CC," >>$mkfile
-	grep "^QMAKE_CXX[^_A-Z0-9]" $QMAKESPEC/qmake.conf | sed "s,QMAKE_CXX,CXX," >>$mkfile
-        grep "^QMAKE_CFLAGS[^_A-Z0-9]" $QMAKESPEC/qmake.conf >>$mkfile
-        grep "^QMAKE_CXXFLAGS[^_A-Z0-9]" $QMAKESPEC/qmake.conf | sed "s,\$\$QMAKE_CFLAGS,\$(QMAKE_CFLAGS)," >>$mkfile
-        grep "^QMAKE_LFLAGS[^_A-Z0-9]" $QMAKESPEC/qmake.conf >>$mkfile
+	grep "^QMAKE_CC[^_A-Z0-9]" $QMAKESPEC/tqmake.conf | sed "s,QMAKE_CC,CC," >>$mkfile
+	grep "^QMAKE_CXX[^_A-Z0-9]" $QMAKESPEC/tqmake.conf | sed "s,QMAKE_CXX,CXX," >>$mkfile
+        grep "^QMAKE_CFLAGS[^_A-Z0-9]" $QMAKESPEC/tqmake.conf >>$mkfile
+        grep "^QMAKE_CXXFLAGS[^_A-Z0-9]" $QMAKESPEC/tqmake.conf | sed "s,\$\$QMAKE_CFLAGS,\$(QMAKE_CFLAGS)," >>$mkfile
+        grep "^QMAKE_LFLAGS[^_A-Z0-9]" $QMAKESPEC/tqmake.conf >>$mkfile
 	if [ "$CFG_DEBUG" = "yes" ]; then
-            grep "QMAKE_CFLAGS_DEBUG[^_A-Z0-9]" $QMAKESPEC/qmake.conf >>$mkfile
-            grep "^QMAKE_CXXFLAGS_DEBUG[^_A-Z0-9]" $QMAKESPEC/qmake.conf | sed "s,\$\$QMAKE_CFLAGS_DEBUG,\$(QMAKE_CFLAGS_DEBUG)," >>$mkfile
+            grep "QMAKE_CFLAGS_DEBUG[^_A-Z0-9]" $QMAKESPEC/tqmake.conf >>$mkfile
+            grep "^QMAKE_CXXFLAGS_DEBUG[^_A-Z0-9]" $QMAKESPEC/tqmake.conf | sed "s,\$\$QMAKE_CFLAGS_DEBUG,\$(QMAKE_CFLAGS_DEBUG)," >>$mkfile
 	    EXTRA_CFLAGS="$EXTRA_CFLAGS \$(QMAKE_CFLAGS_DEBUG)"
 	    EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(QMAKE_CXXFLAGS_DEBUG)"
 	else
-	    grep "QMAKE_CFLAGS_RELEASE[^_A-Z0-9]" $QMAKESPEC/qmake.conf >>$mkfile
-	    grep "^QMAKE_CXXFLAGS_RELEASE[^_A-Z0-9]" $QMAKESPEC/qmake.conf | sed "s,\$\$QMAKE_CFLAGS_RELEASE,\$(QMAKE_CFLAGS_RELEASE)," >>$mkfile
+	    grep "QMAKE_CFLAGS_RELEASE[^_A-Z0-9]" $QMAKESPEC/tqmake.conf >>$mkfile
+	    grep "^QMAKE_CXXFLAGS_RELEASE[^_A-Z0-9]" $QMAKESPEC/tqmake.conf | sed "s,\$\$QMAKE_CFLAGS_RELEASE,\$(QMAKE_CFLAGS_RELEASE)," >>$mkfile
 	    EXTRA_CFLAGS="$EXTRA_CFLAGS \$(QMAKE_CFLAGS_RELEASE)"
 	    EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(QMAKE_CXXFLAGS_RELEASE)"
         fi
@@ -2157,21 +2157,21 @@ if true; then ###[ '!' -f "$outpath/bin/tqmake" ];
 
 	if [ "$Edition" = "troll" ] &&
 	    $WHICH makedepend >/dev/null 2>&1 && grep 'depend:' "$mkfile" >/dev/null 2>&1; then
-	    (cd $outpath/qmake && $MAKE -f $mkfile depend) >/dev/null 2>&1
+	    (cd $outpath/tqmake && $MAKE -f $mkfile depend) >/dev/null 2>&1
 	fi
     done
 
-    (cd $outpath/qmake; $MAKE || (echo "qmake failed to build. Aborting." && exit 2)) || exit 2
+    (cd $outpath/tqmake; $MAKE || (echo "tqmake failed to build. Aborting." && exit 2)) || exit 2
 fi
 
 # clean up temporary tqconfig.h and tqmodules.h
-rm -f $outpath/include/qmake/tqconfig.h
-rm -f $outpath/include/qmake/tqmodules.h
-rmdir $outpath/include/qmake
+rm -f $outpath/include/tqmake/tqconfig.h
+rm -f $outpath/include/tqmake/tqmodules.h
+rmdir $outpath/include/tqmake
 
 
 #-------------------------------------------------------------------------------
-# tests that need qmake
+# tests that need tqmake
 #-------------------------------------------------------------------------------
 
 # work around broken X11 headers when using GCC 2.95 or later
@@ -2186,7 +2186,7 @@ if [ $PLATFORM = "hpux-acc" -a "$CFG_STL" != "no" ]; then
    echo
    echo "As of aCC A.3.0.30 you may enable STL support in TQt by adding -AA"
    echo "to the QMAKE_CXXFLAGS and QMAKE_LFLAGS variables in"
-   echo "$XQMAKESPEC/qmake.conf"
+   echo "$XQMAKESPEC/tqmake.conf"
    echo "and re-running configure. Make sure to use the -AA compiler switch"
    echo "in all your software projects using TQt as it turns on the new C++"
    echo "Standard Library which is not binary compatible with the old one."
@@ -2473,7 +2473,7 @@ fi
 [ '!' -z "$l_FLAGS" ] && QMAKE_VARS="$QMAKE_VARS \"LIBS+=$l_FLAGS\""
 
 if [ '!' -z "$R_FLAGS" ]; then
-    if grep QMAKE_RPATH $XQMAKESPEC/qmake.conf >/dev/null; then
+    if grep QMAKE_RPATH $XQMAKESPEC/tqmake.conf >/dev/null; then
 	echo # Using -R/-rpath, so no need to warn
     else
 	echo
@@ -2557,7 +2557,7 @@ fi
 case "$COMPILER" in
 g++*)
     # GNU C++
-    QMAKE_CONF_COMPILER=`grep "QMAKE_CXX[^_A-Z0-9a-z]" $QMAKESPEC/qmake.conf | sed "s,.* *= *\(.*\)$,\1,"`
+    QMAKE_CONF_COMPILER=`grep "QMAKE_CXX[^_A-Z0-9a-z]" $QMAKESPEC/tqmake.conf | sed "s,.* *= *\(.*\)$,\1,"`
     COMPILER_VERSION=`${QMAKE_CONF_COMPILER} -dumpversion 2>/dev/null | sed 's,^[^0-9]*,,g'`
     case "$COMPILER_VERSION" in
     2.95.*)
@@ -2576,7 +2576,7 @@ g++*)
     ;;
 clang)
     # Clang
-    QMAKE_CONF_COMPILER=`grep "QMAKE_CXX[^_A-Z0-9a-z]" $QMAKESPEC/qmake.conf | sed "s,.* *= *\(.*\)$,\1,"`
+    QMAKE_CONF_COMPILER=`grep "QMAKE_CXX[^_A-Z0-9a-z]" $QMAKESPEC/tqmake.conf | sed "s,.* *= *\(.*\)$,\1,"`
     COMPILER_VERSION=`${QMAKE_CONF_COMPILER} -dumpversion 2>/dev/null | sed 's,^[^0-9]*,,g'`
     case "$COMPILER_VERSION" in
     *)
@@ -2818,10 +2818,10 @@ fi
 
 
 #-------------------------------------------------------------------------------
-# save configuration into .qmake.cache
+# save configuration into .tqmake.cache
 #-------------------------------------------------------------------------------
 
-CACHEFILE=$outpath/.qmake.cache
+CACHEFILE=$outpath/.tqmake.cache
 [ -f $CACHEFILE.tmp ] && rm -f $CACHEFILE.tmp
 cat >>$CACHEFILE.tmp <<EOF
 CONFIG += $QMAKE_CONFIG dylib create_prl link_prl
@@ -2862,10 +2862,10 @@ if [ "$CFG_INCREMENTAL" = "yes" ]; then
 	INCREMENTAL="$INCREMENTAL `basename $f | sed 's,.cpp,.o,'`"
     done
     [ '!' -z "$INCREMENTAL" ] && echo "QMAKE_INCREMENTAL += $INCREMENTAL" >>$CACHEFILE.tmp
-    [ -r "$outpath/.qmake.incremental" ] && echo "include($outpath/.qmake.incremental)" >>$CACHEFILE.tmp
+    [ -r "$outpath/.tqmake.incremental" ] && echo "include($outpath/.tqmake.incremental)" >>$CACHEFILE.tmp
 fi
 
-# replace .qmake.cache if it differs from the newly created temp file
+# replace .tqmake.cache if it differs from the newly created temp file
 if cmp -s $CACHEFILE.tmp $CACHEFILE; then
     rm -f $CACHEFILE.tmp
 else
@@ -2933,8 +2933,8 @@ else
 fi
 
 if [ "$OPT_VERBOSE" = "yes" ]; then
-    echo "qmake vars ...... $QMAKE_VARS"
-    echo "qmake switches .. $QMAKE_SWITCHES"
+    echo "tqmake vars ...... $QMAKE_VARS"
+    echo "tqmake switches .. $QMAKE_SWITCHES"
 fi
 
 [ "$OPT_CONCURRENT" != "0" ] && echo "Concurrent .......... $OPT_CONCURRENT"
@@ -3172,7 +3172,7 @@ for file in .projects .projects.3; do
     for a in `cat $file`; do
 	case $a in
 	*-kde.pro|*qtmain.pro) continue ;;
-	*/qmake/qmake.pro) continue ;;
+	*/tqmake/tqmake.pro) continue ;;
 	*projects.pro) continue ;;
 	*-pro.pro)
 	    [ "x$Edition" != "xpro" ] && continue
@@ -3185,8 +3185,8 @@ for file in .projects .projects.3; do
 	OUTDIR=$outpath/$dir
 	if [ -f "${OUTDIR}/Makefile" ] && [ "$OPT_FAST" = "yes" ]; then
 	    # fast configure - the makefile exists, skip it
-	    # since the makefile exists, it was generated by qmake, which means we
-	    # can skip it, since qmake has a rule to regenerate the makefile if the .pro
+	    # since the makefile exists, it was generated by tqmake, which means we
+	    # can skip it, since tqmake has a rule to regenerate the makefile if the .pro
 	    # file changes...
 	    [ "$OPT_VERBOSE" = "yes" ] && echo "  skipping $a"
 	    continue;
@@ -3211,7 +3211,7 @@ for file in .projects .projects.3; do
 # WARNING: This makefile will be replaced with a real makefile.
 # All changes made to this file will be lost.
 
-all clean install qmake Makefile: FORCE
+all clean install tqmake Makefile: FORCE
 	$outpath/bin/tqmake $QMAKE_SWITCHES $QMAKE_SPEC_ARGS -o $OUTDIR $a
 	cd $OUTDIR
 	\$(MAKE) \$@