Fix libtqt-perl from building smoke support when tdebindings has that support.

This resolves bug report 1269.

12 files changed, 70 insertions, 70 deletions

diff --git a/INSTALL b/INSTALL
index 1c87032..3667192 100644
--- a/INSTALL
+++ b/INSTALL
@@ -29,7 +29,7 @@ Custom important options :
 --with-threshold=<0..15> : set the lever of standardness of your TQt
                  library. Default is 10, which is reasonable.
                  If your TQt library is very customized, and you
-                 experience missing symbols in libsmoketqt.so, 
+                 experience missing symbols in libsmokeqt.so, 
                  set this to zero (paranoid level).
 ====
 
diff --git a/Makefile.PL b/Makefile.PL
index 8f46637..d928fc9 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -100,7 +100,7 @@ unless ($ENV{'TDEDIR'} or grep /--prefix/, @ARGV)
         "did not use the '--prefix=' commandline option.\n";
   print "KDE-3 isn't required at all. However, if it's installed on your system,\n".
         "it is much better to specify it's location since PerlTQt uses (or build, if\n".
-        "it can't find it) a KDE library named smoketqt.\n";
+        "it can't find it) a KDE library named smokeqt.\n";
   print "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n\n";
   sleep(5);
 }
diff --git a/PerlTQt/INSTALL b/PerlTQt/INSTALL
index b243233..da1c2dc 100644
--- a/PerlTQt/INSTALL
+++ b/PerlTQt/INSTALL
@@ -4,9 +4,9 @@ http://mail.kde.org/mailman/listinfo/kde-perl or send a subscribe message
 to [email protected]. Please send patches and bug reports
 to the mailing-list.
 
-This file contains instructions for downloading and building the SmokeTQt
+This file contains instructions for downloading and building the SmokeQt
 library and PerlTQt. PerlTQt is not a direct Perl interface to the TQt
-library, but is rather an interface to the SmokeTQt library generated by
+library, but is rather an interface to the SmokeQt library generated by
 Kalyptus.
 
 The programs+version I use, but not necessarily required:
@@ -21,7 +21,7 @@ Make sure your $TQTDIR environment-variable is set.
 I'm sorry for all the requirements, but you *are* getting this from 
 CVS. Release versions will be much easier and more independant.
 
-First, you need to download the development environment for smoketqt.
+First, you need to download the development environment for smokeqt.
 Please use compression for cvs downloads ('cvs -z4' in .cvsrc).
 
 $ export CVSROOT=:pserver:[email protected]:/home/kde
@@ -32,7 +32,7 @@ $ cvs co kdebindings/smoke    # pre-generated smoke library
 $ cd kdebindings              # kdebindings/
 $ cvs co admin                # get kde build tools
 
-At this point, you now have the full smoketqt environment. The
+At this point, you now have the full smokeqt environment. The
 pre-generated smoke library is based off KDE's copy of TQt-3.0.4. I have
 TQt-3.0.1, so I have to re-generate the files to match my installed 
 version of TQt. Here's how to do it.
@@ -41,7 +41,7 @@ $ cd smoke/qt                 # kdebindings/smoke/qt/
 $ perl ./qtguess.pl           # simple script to find disabled TQt features
 $ perl ./generate.pl          # calls kalyptus which generates code
 
-Now you have the SmokeTQt source-code generated for your personal TQt
+Now you have the SmokeQt source-code generated for your personal TQt
 configuration. Here's how to compile.
 
 $ cd ../..                    # kdebindings/
@@ -51,7 +51,7 @@ $ cd smoke                    # kdebindings/smoke/
 $ make                        # this should succeed
 $ make install                # will install to --prefix from configure
 
-Okay, you now have libsmoketqt installed on your system. You can now
+Okay, you now have libsmokeqt installed on your system. You can now
 compile PerlTQt. First, get the latest version of PerlTQt-3.
 
 $ export CVSROOT=:pserver:[email protected]:/cvsroot/perlqt
@@ -59,7 +59,7 @@ $ cvs login                   # no password
 $ cvs co PerlTQt-3
 $ cd PerlTQt-3                 # PerlTQt-3/
 
-If you installed libsmoketqt in a non-standard library path, you will
+If you installed libsmokeqt in a non-standard library path, you will
 need to edit Makefile.PL and add -L/your/lib/path to the LIBS
 parameter. If any of the other options in Makefile.PL need changing for
 your system, you will need to change it now.
diff --git a/PerlTQt/Makefile.PL.in b/PerlTQt/Makefile.PL.in
index bcf72af..7746d30 100644
--- a/PerlTQt/Makefile.PL.in
+++ b/PerlTQt/Makefile.PL.in
@@ -85,7 +85,7 @@ WriteMakefile(
     'VERSION_FROM'	=> 'TQt.pm', # finds $VERSION
     'PREREQ_PM'		=> {}, # e.g., Module::Name => 1.1,
     'INC'		=> '@all_includes@ -I. -I../smoke',
-    'LIBS'		=> ['@all_libraries@'." -L$localsmoke -lsmoketqt ".'@LIBCRYPT@'." $qtlib"],
+    'LIBS'		=> ['@all_libraries@'." -L$localsmoke -lsmokeqt ".'@LIBCRYPT@'." $qtlib"],
 #   'XS'		=> {'TQt.xs' => 'TQt.cpp'}, # does not work ... still expects TQt.c 
     'XSOPT'		=> "-C++",
     'OBJECT'		=> "$objects",  # Object files
@@ -116,7 +116,7 @@ sub MY::const_loadlibs {
                    package MY;
                    my $i = shift->SUPER::const_loadlibs(@_);
                    # hacks for linking against a non-yet-installed smoke
-                   $i =~ s/((?:EXTRALIBS|LDLOADLIBS).*?)\n/$1 -L$localsmoke -lsmoketqt\n/gs unless $i =~/-lsmoketqt/;
+                   $i =~ s/((?:EXTRALIBS|LDLOADLIBS).*?)\n/$1 -L$localsmoke -lsmokeqt\n/gs unless $i =~/-lsmokeqt/;
                    $i =~ s#(LD_RUN_PATH.*?)(${localsmoke})?\n#"$1".($2?"":":")."$x{'libdir'}\n"#se;
                    $i;
 }
diff --git a/configure.in b/configure.in
index 2375b17..de5a5c4 100644
--- a/configure.in
+++ b/configure.in
@@ -103,8 +103,8 @@ AC_CACHE_VAL(ac_cv_have_kde,
 [#try to guess kde locations
 
 dnl PQT
-kde_check_header="kdeversion.h"
-kde_check_lib="libkdefx.la"
+kde_check_header="tdeversion.h"
+kde_check_lib="libtdefx.la"
 dnl /PQT
 
 if test -z "$1"; then
@@ -235,8 +235,8 @@ dnl-------------------------------
 
 AC_DEFUN(KDE_CHECK_SMOKE,
 [
-AC_MSG_CHECKING(for SmokeTQt)
-AC_CACHE_VAL(kde_have_smoketqt,
+AC_MSG_CHECKING(for SmokeQt)
+AC_CACHE_VAL(kde_have_smokeqt,
 [
 
  kde_ldflags_safe="$LDFLAGS"
@@ -246,7 +246,7 @@ AC_CACHE_VAL(kde_have_smoketqt,
 
  AC_LANG_SAVE
  AC_LANG_CPLUSPLUS
- LIBS="-lsmoketqt"
+ LIBS="-lsmokeqt"
  CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes"
  LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
  LD_LIBRARY_PATH="$qt_libraries"
@@ -258,8 +258,8 @@ AC_CACHE_VAL(kde_have_smoketqt,
  [
    Smoke::Index i;
  ],
-  kde_have_smoketqt=yes,
-  kde_have_smoketqt=no
+  kde_have_smokeqt=yes,
+  kde_have_smokeqt=no
  )
 
  LDFLAGS=$kde_ldflags_safe
@@ -270,9 +270,9 @@ AC_CACHE_VAL(kde_have_smoketqt,
 
 AC_LANG_RESTORE
 
-AC_MSG_RESULT($kde_have_smoketqt)
+AC_MSG_RESULT($kde_have_smokeqt)
 
-$1=$kde_have_smoketqt
+$1=$kde_have_smokeqt
 ])
 
 
diff --git a/doc/en/PerlQt.pod b/doc/en/PerlQt.pod
index 0f3ebe7..a93256c 100644
--- a/doc/en/PerlQt.pod
+++ b/doc/en/PerlQt.pod
@@ -56,7 +56,7 @@ v3.0|"http://www.trolltech.com/developer/download/qt-x11.html">
 
 =item *
 
-L<SmokeTQt 1.2.1|"http://webcvs.kde.org/cgi-bin/cvsweb.cgi/kdebindings/smoke">
+L<SmokeQt 1.2.1|"http://webcvs.kde.org/cgi-bin/cvsweb.cgi/kdebindings/smoke">
 The SMOKE library (Scripting Meta Object Kompiler) is part of L<KDE|"http://www.kde.org">'s B<kdebindings> module.
 You may want to check if a precompiled version of this module exists for your
 system.
diff --git a/doc/en/index.html b/doc/en/index.html
index 352240b..ffcb4d0 100644
--- a/doc/en/index.html
+++ b/doc/en/index.html
@@ -119,7 +119,7 @@ GNU tools : automake(&gt;=1.5), autoconf (&gt;=2.13), aclocal...
 <a href="http://www.trolltech.com/developer/download/qtx11.html">TQt &gt;= v3.0</a>
 <p></p>
 <li></li>
-<a href="http://webcvs.kde.org/cgi-bin/cvsweb.cgi/kdebindings/smoke">SmokeTQt 1.2.1</a>
+<a href="http://webcvs.kde.org/cgi-bin/cvsweb.cgi/kdebindings/smoke">SmokeQt 1.2.1</a>
 The SMOKE library (Scripting Meta Object Kompiler) is part of <a href="http://www.kde.org">KDE</a>'s <strong>kdebindings</strong> module.
 You may want to check if a precompiled version of this module exists for your
 system.
diff --git a/doc/fr/PerlQt.pod b/doc/fr/PerlQt.pod
index 2dc91fc..b59da51 100644
--- a/doc/fr/PerlQt.pod
+++ b/doc/fr/PerlQt.pod
@@ -57,7 +57,7 @@ v3.0|"http://www.trolltech.com/developer/download/qt-x11.html">
 
 =item *
 
-L<SmokeTQt
+L<SmokeQt
 1.2.1|"http://webcvs.kde.org/cgi-bin/cvsweb.cgi/kdebindings/smoke"> La
 librarie SMOKE  (Scripting Meta Object Kompiler) fait partie du module
 L<KDE|"http://www.kde.org">'s B<kdebindings>.  Vous pouvez v�rifier si
diff --git a/doc/fr/index.html b/doc/fr/index.html
index 0db306c..3e4a3fe 100644
--- a/doc/fr/index.html
+++ b/doc/fr/index.html
@@ -119,7 +119,7 @@ un syst�me conforme � la norme POSIX.
 <a href="http://www.trolltech.com/developer/download/qtx11.html">TQt &gt;= v3.0</a>
 <p></p>
 <li></li>
-<a href="http://webcvs.kde.org/cgi-bin/cvsweb.cgi/kdebindings/smoke">SmokeTQt 1.2.1</a> La
+<a href="http://webcvs.kde.org/cgi-bin/cvsweb.cgi/kdebindings/smoke">SmokeQt 1.2.1</a> La
 librarie SMOKE  (Scripting Meta Object Kompiler) fait partie du module
 <a href="http://www.kde.org">KDE</a>'s <strong>kdebindings</strong>.  Vous pouvez v�rifier si
 une version pr�compil�e de ce module existe pour votre syst�me. Mais
diff --git a/smoke/qt/Makefile.am b/smoke/qt/Makefile.am
index 3614181..63e4ec8 100644
--- a/smoke/qt/Makefile.am
+++ b/smoke/qt/Makefile.am
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libsmoketqt.la
+lib_LTLIBRARIES = libsmokeqt.la
 
 # set the include path for X, qt and KDE
 INCLUDES         = -I$(srcdir)/.. $(all_includes)
@@ -6,12 +6,12 @@ INCLUDES         = -I$(srcdir)/.. $(all_includes)
 EXTRA_DIST=generate.pl.in qtguess.pl.in qt_smoke.h Makefile.am Makefile.in
 
 # the library search path. 
-libsmoketqt_la_LDFLAGS = -version-info 3:1:2 -no-undefined $(all_libraries) $(GL_CFLAGS) $(KDE_RPATH)
+libsmokeqt_la_LDFLAGS = -version-info 3:1:2 -no-undefined $(all_libraries) $(GL_CFLAGS) $(KDE_RPATH)
 
 # the libraries to link against.
-libsmoketqt_la_LIBADD   = $(LIB_QT) $(GL_LIBS)
+libsmokeqt_la_LIBADD   = $(LIB_QT) $(GL_LIBS)
 
 # which sources should be compiled for perlqtkde
-libsmoketqt_la_SOURCES =  smokedata.cpp x_1.cpp x_2.cpp x_3.cpp x_4.cpp x_5.cpp x_6.cpp x_7.cpp \
+libsmokeqt_la_SOURCES =  smokedata.cpp x_1.cpp x_2.cpp x_3.cpp x_4.cpp x_5.cpp x_6.cpp x_7.cpp \
  x_8.cpp x_9.cpp x_10.cpp x_11.cpp x_12.cpp x_13.cpp x_14.cpp x_15.cpp \
  x_16.cpp x_17.cpp x_18.cpp x_19.cpp x_20.cpp
diff --git a/smoke/qt/Makefile.in b/smoke/qt/Makefile.in
index 69a4147..6a98cac 100644
--- a/smoke/qt/Makefile.in
+++ b/smoke/qt/Makefile.in
@@ -193,7 +193,7 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
-lib_LTLIBRARIES = libsmoketqt.la
+lib_LTLIBRARIES = libsmokeqt.la
 
 # set the include path for X, qt and KDE
 INCLUDES = -I$(srcdir)/.. $(all_includes)
@@ -201,15 +201,15 @@ INCLUDES = -I$(srcdir)/.. $(all_includes)
 EXTRA_DIST = generate.pl.in qtguess.pl.in qt_smoke.h Makefile.am Makefile.in
 
 # the library search path. 
-#>- libsmoketqt_la_LDFLAGS = -version-info 3:1:2 -no-undefined $(all_libraries) $(GL_CFLAGS) $(KDE_RPATH)
+#>- libsmokeqt_la_LDFLAGS = -version-info 3:1:2 -no-undefined $(all_libraries) $(GL_CFLAGS) $(KDE_RPATH)
 #>+ 1
-libsmoketqt_la_LDFLAGS = -version-info 3:1:2 -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries) $(GL_CFLAGS) $(KDE_RPATH)
+libsmokeqt_la_LDFLAGS = -version-info 3:1:2 -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries) $(GL_CFLAGS) $(KDE_RPATH)
 
 # the libraries to link against.
-libsmoketqt_la_LIBADD = $(LIB_QT) $(GL_LIBS)
+libsmokeqt_la_LIBADD = $(LIB_QT) $(GL_LIBS)
 
 # which sources should be compiled for perlqtkde
-libsmoketqt_la_SOURCES = smokedata.cpp x_1.cpp x_2.cpp x_3.cpp x_4.cpp x_5.cpp x_6.cpp x_7.cpp \
+libsmokeqt_la_SOURCES = smokedata.cpp x_1.cpp x_2.cpp x_3.cpp x_4.cpp x_5.cpp x_6.cpp x_7.cpp \
  x_8.cpp x_9.cpp x_10.cpp x_11.cpp x_12.cpp x_13.cpp x_14.cpp x_15.cpp \
  x_16.cpp x_17.cpp x_18.cpp x_19.cpp x_20.cpp
 
@@ -219,18 +219,18 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = qtguess.pl generate.pl
 LTLIBRARIES = $(lib_LTLIBRARIES)
 
-libsmoketqt_la_DEPENDENCIES =
-am_libsmoketqt_la_OBJECTS = smokedata.lo x_1.lo x_2.lo x_3.lo x_4.lo \
+libsmokeqt_la_DEPENDENCIES =
+am_libsmokeqt_la_OBJECTS = smokedata.lo x_1.lo x_2.lo x_3.lo x_4.lo \
 	x_5.lo x_6.lo x_7.lo x_8.lo x_9.lo x_10.lo x_11.lo x_12.lo \
 	x_13.lo x_14.lo x_15.lo x_16.lo x_17.lo x_18.lo x_19.lo x_20.lo
-#>- libsmoketqt_la_OBJECTS = $(am_libsmoketqt_la_OBJECTS)
+#>- libsmokeqt_la_OBJECTS = $(am_libsmokeqt_la_OBJECTS)
 #>+ 6
-libsmoketqt_la_final_OBJECTS = libsmoketqt_la.all_cpp.lo 
-libsmoketqt_la_nofinal_OBJECTS = smokedata.lo x_1.lo x_2.lo x_3.lo x_4.lo \
+libsmokeqt_la_final_OBJECTS = libsmokeqt_la.all_cpp.lo 
+libsmokeqt_la_nofinal_OBJECTS = smokedata.lo x_1.lo x_2.lo x_3.lo x_4.lo \
 	x_5.lo x_6.lo x_7.lo x_8.lo x_9.lo x_10.lo x_11.lo x_12.lo \
 	x_13.lo x_14.lo x_15.lo x_16.lo x_17.lo x_18.lo x_19.lo x_20.lo
-@KDE_USE_FINAL_FALSE@libsmoketqt_la_OBJECTS = $(libsmoketqt_la_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@libsmoketqt_la_OBJECTS = $(libsmoketqt_la_final_OBJECTS)
+@KDE_USE_FINAL_FALSE@libsmokeqt_la_OBJECTS = $(libsmokeqt_la_nofinal_OBJECTS)
+@KDE_USE_FINAL_TRUE@libsmokeqt_la_OBJECTS = $(libsmokeqt_la_final_OBJECTS)
 
 DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
@@ -247,7 +247,7 @@ am__depfiles_maybe = depfiles
 #>- @AMDEP_TRUE@	./$(DEPDIR)/x_7.Plo ./$(DEPDIR)/x_8.Plo \
 #>- @AMDEP_TRUE@	./$(DEPDIR)/x_9.Plo
 #>+ 23
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =   $(DEPDIR)/libsmoketqt_la.all_cpp.P  ./$(DEPDIR)/smokedata.Plo ./$(DEPDIR)/x_1.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =   $(DEPDIR)/libsmokeqt_la.all_cpp.P  ./$(DEPDIR)/smokedata.Plo ./$(DEPDIR)/x_1.Plo \
 @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/x_10.Plo ./$(DEPDIR)/x_11.Plo \
 @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/x_12.Plo ./$(DEPDIR)/x_13.Plo \
 @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/x_14.Plo ./$(DEPDIR)/x_15.Plo \
@@ -288,9 +288,9 @@ CXXLD = $(CXX)
 #>+ 2
 CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(libsmoketqt_la_SOURCES)
+DIST_SOURCES = $(libsmokeqt_la_SOURCES)
 DIST_COMMON = Makefile.am Makefile.in generate.pl.in qtguess.pl.in
-SOURCES = $(libsmoketqt_la_SOURCES)
+SOURCES = $(libsmokeqt_la_SOURCES)
 
 #>- all: all-am
 #>+ 1
@@ -339,11 +339,11 @@ clean-libLTLIBRARIES:
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- libsmoketqt.la: $(libsmoketqt_la_OBJECTS) $(libsmoketqt_la_DEPENDENCIES) 
+#>- libsmokeqt.la: $(libsmokeqt_la_OBJECTS) $(libsmokeqt_la_DEPENDENCIES) 
 #>+ 2
-@[email protected]: libsmoketqt.la.closure $(libsmoketqt_la_OBJECTS) $(libsmoketqt_la_DEPENDENCIES) 
-@[email protected]: $(libsmoketqt_la_OBJECTS) $(libsmoketqt_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libsmoketqt_la_LDFLAGS) $(libsmoketqt_la_OBJECTS) $(libsmoketqt_la_LIBADD) $(LIBS)
+@[email protected]: libsmokeqt.la.closure $(libsmokeqt_la_OBJECTS) $(libsmokeqt_la_DEPENDENCIES) 
+@[email protected]: $(libsmokeqt_la_OBJECTS) $(libsmokeqt_la_DEPENDENCIES) 
+	$(CXXLINK) -rpath $(libdir) $(libsmokeqt_la_LDFLAGS) $(libsmokeqt_la_OBJECTS) $(libsmokeqt_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT) core *.core
@@ -611,17 +611,17 @@ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
 
 
 #>+ 8
-libsmoketqt.la.closure: $(libsmoketqt_la_OBJECTS) $(libsmoketqt_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > libsmoketqt_la_closure.cpp
-	@$(LTCXXCOMPILE) -c libsmoketqt_la_closure.cpp
-	$(CXXLINK) libsmoketqt_la_closure.lo $(libsmoketqt_la_LDFLAGS) $(libsmoketqt_la_OBJECTS) $(libsmoketqt_la_LIBADD) $(LIBS)
-	@rm -f libsmoketqt_la_closure.* libsmoketqt.la.closure
-	@echo "timestamp" > libsmoketqt.la.closure
+libsmokeqt.la.closure: $(libsmokeqt_la_OBJECTS) $(libsmokeqt_la_DEPENDENCIES)
+	@echo "int main() {return 0;}" > libsmokeqt_la_closure.cpp
+	@$(LTCXXCOMPILE) -c libsmokeqt_la_closure.cpp
+	$(CXXLINK) libsmokeqt_la_closure.lo $(libsmokeqt_la_LDFLAGS) $(libsmokeqt_la_OBJECTS) $(libsmokeqt_la_LIBADD) $(LIBS)
+	@rm -f libsmokeqt_la_closure.* libsmokeqt.la.closure
+	@echo "timestamp" > libsmokeqt.la.closure
 
 
 #>+ 3
 clean-closures:
-	-rm -f  libsmoketqt.la.closure
+	-rm -f  libsmokeqt.la.closure
 
 #>+ 2
 docs-am:
@@ -644,33 +644,33 @@ bcheck-am:
 	test ! -s bchecktest.cc.oldclass || test ! -s bchecktest.cc.class || cmp -s bchecktest.cc.oldclass bchecktest.cc.class
 
 #>+ 11
-libsmoketqt_la.all_cpp.cpp: $(srcdir)/Makefile.in smokedata.cpp x_1.cpp x_2.cpp x_3.cpp x_4.cpp x_5.cpp x_6.cpp x_7.cpp x_8.cpp x_9.cpp x_10.cpp x_11.cpp x_12.cpp x_13.cpp x_14.cpp x_15.cpp x_16.cpp x_17.cpp x_18.cpp x_19.cpp x_20.cpp 
-	@echo 'creating libsmoketqt_la.all_cpp.cpp ...'; \
-	rm -f libsmoketqt_la.all_cpp.files libsmoketqt_la.all_cpp.final; \
-	echo "#define KDE_USE_FINAL 1" >> libsmoketqt_la.all_cpp.final; \
+libsmokeqt_la.all_cpp.cpp: $(srcdir)/Makefile.in smokedata.cpp x_1.cpp x_2.cpp x_3.cpp x_4.cpp x_5.cpp x_6.cpp x_7.cpp x_8.cpp x_9.cpp x_10.cpp x_11.cpp x_12.cpp x_13.cpp x_14.cpp x_15.cpp x_16.cpp x_17.cpp x_18.cpp x_19.cpp x_20.cpp 
+	@echo 'creating libsmokeqt_la.all_cpp.cpp ...'; \
+	rm -f libsmokeqt_la.all_cpp.files libsmokeqt_la.all_cpp.final; \
+	echo "#define KDE_USE_FINAL 1" >> libsmokeqt_la.all_cpp.final; \
 	for file in smokedata.cpp x_1.cpp x_2.cpp x_3.cpp x_4.cpp x_5.cpp x_6.cpp x_7.cpp x_8.cpp x_9.cpp x_10.cpp x_11.cpp x_12.cpp x_13.cpp x_14.cpp x_15.cpp x_16.cpp x_17.cpp x_18.cpp x_19.cpp x_20.cpp ; do \
-	  echo "#include \"$$file\"" >> libsmoketqt_la.all_cpp.files; \
-	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libsmoketqt_la.all_cpp.final; \
+	  echo "#include \"$$file\"" >> libsmokeqt_la.all_cpp.files; \
+	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libsmokeqt_la.all_cpp.final; \
 	done; \
-	cat libsmoketqt_la.all_cpp.final libsmoketqt_la.all_cpp.files > libsmoketqt_la.all_cpp.cpp; \
-	rm -f libsmoketqt_la.all_cpp.final libsmoketqt_la.all_cpp.files
+	cat libsmokeqt_la.all_cpp.final libsmokeqt_la.all_cpp.files > libsmokeqt_la.all_cpp.cpp; \
+	rm -f libsmokeqt_la.all_cpp.final libsmokeqt_la.all_cpp.files
 
 #>+ 3
 clean-final:
-	-rm -f libsmoketqt_la.all_cpp.cpp
+	-rm -f libsmokeqt_la.all_cpp.cpp
 
 #>+ 2
 final:
-	$(MAKE) libsmoketqt_la_OBJECTS="$(libsmoketqt_la_final_OBJECTS)" all-am
+	$(MAKE) libsmokeqt_la_OBJECTS="$(libsmokeqt_la_final_OBJECTS)" all-am
 #>+ 2
 final-install:
-	$(MAKE) libsmoketqt_la_OBJECTS="$(libsmoketqt_la_final_OBJECTS)" install-am
+	$(MAKE) libsmokeqt_la_OBJECTS="$(libsmokeqt_la_final_OBJECTS)" install-am
 #>+ 2
 no-final:
-	$(MAKE) libsmoketqt_la_OBJECTS="$(libsmoketqt_la_nofinal_OBJECTS)" all-am
+	$(MAKE) libsmokeqt_la_OBJECTS="$(libsmokeqt_la_nofinal_OBJECTS)" all-am
 #>+ 2
 no-final-install:
-	$(MAKE) libsmoketqt_la_OBJECTS="$(libsmoketqt_la_nofinal_OBJECTS)" install-am
+	$(MAKE) libsmokeqt_la_OBJECTS="$(libsmokeqt_la_nofinal_OBJECTS)" install-am
 #>+ 3
 cvs-clean:
 	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
diff --git a/smoke/qt/generate_makefile_am.pl b/smoke/qt/generate_makefile_am.pl
index 8f528bd..49cdd49 100755
--- a/smoke/qt/generate_makefile_am.pl
+++ b/smoke/qt/generate_makefile_am.pl
@@ -14,16 +14,16 @@ open( MAKEFILE, "<$outdir/Makefile.am" ) or die;
 my $makeFileData = '';
 my $found = 0;
 while (<MAKEFILE>) {
-	if (/^libsmoketqt_la_SOURCES/)
+	if (/^libsmokeqt_la_SOURCES/)
 	{
 		$found = 1;
-		$makeFileData .= "libsmoketqt_la_SOURCES = smokedata.cpp";
+		$makeFileData .= "libsmokeqt_la_SOURCES = smokedata.cpp";
 	}
 	$makeFileData .= $_ if (!$found);
 }
 close MAKEFILE;
 
-die "libsmoketqt_la_SOURCES not found" if (!$found);
+die "libsmokeqt_la_SOURCES not found" if (!$found);
 
 open( MAKEFILE, ">$tempfile" ) or die;
 print MAKEFILE $makeFileData;