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

This resolves bug report 1269.

3 files changed, 46 insertions, 46 deletions

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;