From b0b1269481829b26c9b8be60cedc1b6e2f5a35a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 23 Jul 2013 01:37:03 +0200 Subject: [PATCH] Rename smokeqt -> smoketqt --- INSTALL | 2 +- Makefile.PL | 4 +- Makefile.am | 4 +- Makefile.in | 6 +- PerlTQt/INSTALL | 16 ++-- PerlTQt/Makefile.PL.in | 4 +- configure.in | 20 ++--- doc/en/PerlQt.pod | 2 +- doc/en/index.html | 2 +- doc/fr/PerlQt.pod | 2 +- doc/fr/index.html | 2 +- smoke/Makefile.am | 2 +- smoke/Makefile.in | 2 +- smoke/{qt => tqt}/Makefile.am | 8 +- smoke/{qt => tqt}/Makefile.in | 90 +++++++++++------------ smoke/{qt => tqt}/generate.pl.in | 0 smoke/{qt => tqt}/generate_makefile_am.pl | 6 +- smoke/{qt => tqt}/header_list | 0 smoke/{qt => tqt}/qt_smoke.h | 0 smoke/{qt => tqt}/qtguess.pl.in | 0 20 files changed, 86 insertions(+), 86 deletions(-) rename smoke/{qt => tqt}/Makefile.am (58%) rename smoke/{qt => tqt}/Makefile.in (87%) rename smoke/{qt => tqt}/generate.pl.in (100%) rename smoke/{qt => tqt}/generate_makefile_am.pl (87%) rename smoke/{qt => tqt}/header_list (100%) rename smoke/{qt => tqt}/qt_smoke.h (100%) rename smoke/{qt => tqt}/qtguess.pl.in (100%) diff --git a/INSTALL b/INSTALL index 3667192..1c87032 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 libsmokeqt.so, + experience missing symbols in libsmoketqt.so, set this to zero (paranoid level). ==== diff --git a/Makefile.PL b/Makefile.PL index d928fc9..926f00e 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -98,9 +98,9 @@ unless ($ENV{'TDEDIR'} or grep /--prefix/, @ARGV) print "\n!!!!!!!!!!!! WARNING !!!!!!!!!!!!\n". " Your TDEDIR environment variable is not set and you\n". "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". + print "TDE 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 smokeqt.\n"; + "it can't find it) a TDE library named smoketqt.\n"; print "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n\n"; sleep(5); } diff --git a/Makefile.am b/Makefile.am index 1b332d7..1060dee 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ SUBDIRS = $(TOPSUBDIRS) -EXTRA_DIST = admin AUTHORS COPYING ChangeLog INSTALL README TODO Makefile.cvs test.pl Makefile.PL inst-apps smoke/smoke.h smoke/Makefile.in smoke/Makefile.am smoke/qt/qtguess.pl.in smoke/qt/generate.pl.in smoke/qt/qt_smoke.h smoke/qt/generate_makefile_am.pl smoke/qt/Makefile.am smoke/qt/Makefile.in smoke/qt/header_list kalyptus/Ast.pm kalyptus/kalyptus kalyptus/kalyptusDataDict.pm kalyptus/kdocParseDoc.pm kalyptus/Version kalyptus/ChangeLog kalyptus/kdocUtil.pm kalyptus/kdocAstUtil.pm kalyptus/README kalyptus/Iter.pm kalyptus/kalyptusCxxToSmoke.pm kalyptus/kdocLib.pm kalyptus/TODO doc/en/index.html doc/en/Makefile doc/en/PerlTQt.pod doc/fr/index.html doc/fr/Makefile doc/fr/PerlTQt.pod doc/css/pod.css doc/images/ex1.png doc/images/ex2.png doc/images/pqtsh.png +EXTRA_DIST = admin AUTHORS COPYING ChangeLog INSTALL README TODO Makefile.cvs test.pl Makefile.PL inst-apps smoke/smoke.h smoke/Makefile.in smoke/Makefile.am smoke/tqt/qtguess.pl.in smoke/tqt/generate.pl.in smoke/tqt/qt_smoke.h smoke/tqt/generate_makefile_am.pl smoke/tqt/Makefile.am smoke/tqt/Makefile.in smoke/tqt/header_list kalyptus/Ast.pm kalyptus/kalyptus kalyptus/kalyptusDataDict.pm kalyptus/kdocParseDoc.pm kalyptus/Version kalyptus/ChangeLog kalyptus/kdocUtil.pm kalyptus/kdocAstUtil.pm kalyptus/README kalyptus/Iter.pm kalyptus/kalyptusCxxToSmoke.pm kalyptus/kdocLib.pm kalyptus/TODO doc/en/index.html doc/en/Makefile doc/en/PerlTQt.pod doc/fr/index.html doc/fr/Makefile doc/fr/PerlTQt.pod doc/css/pod.css doc/images/ex1.png doc/images/ex2.png doc/images/pqtsh.png # not a GNU package. You can remove this line, if # have all needed files, that a GNU package needs @@ -27,7 +27,7 @@ dist-hook: cd $(top_distdir) && $(MAKE) -f admin/Makefile.common subdirs test: - cd $(top_distdir) && LD_LIBRARY_PATH="../../smoke/qt/.libs:@qt_libraries@" PERL_DL_NONLAZY=1 perl test.pl + cd $(top_distdir) && LD_LIBRARY_PATH="../../smoke/tqt/.libs:@qt_libraries@" PERL_DL_NONLAZY=1 perl test.pl ChangeLog: perl cvs2cl.pl -P -S --no-wrap -f ChangeLog.CVS diff --git a/Makefile.in b/Makefile.in index d20ea77..3a1b585 100644 --- a/Makefile.in +++ b/Makefile.in @@ -196,7 +196,7 @@ x_libraries = @x_libraries@ SUBDIRS = $(TOPSUBDIRS) -EXTRA_DIST = admin AUTHORS COPYING ChangeLog INSTALL README TODO Makefile.cvs test.pl Makefile.PL inst-apps smoke/smoke.h smoke/Makefile.in smoke/Makefile.am smoke/qt/qtguess.pl.in smoke/qt/generate.pl.in smoke/qt/qt_smoke.h smoke/qt/generate_makefile_am.pl smoke/qt/Makefile.am smoke/qt/Makefile.in smoke/qt/header_list kalyptus/Ast.pm kalyptus/kalyptus kalyptus/kalyptusDataDict.pm kalyptus/kdocParseDoc.pm kalyptus/Version kalyptus/ChangeLog kalyptus/kdocUtil.pm kalyptus/kdocAstUtil.pm kalyptus/README kalyptus/Iter.pm kalyptus/kalyptusCxxToSmoke.pm kalyptus/kdocLib.pm kalyptus/TODO doc/en/index.html doc/en/Makefile doc/en/PerlTQt.pod doc/fr/index.html doc/fr/Makefile doc/fr/PerlTQt.pod doc/css/pod.css doc/images/ex1.png doc/images/ex2.png doc/images/pqtsh.png +EXTRA_DIST = admin AUTHORS COPYING ChangeLog INSTALL README TODO Makefile.cvs test.pl Makefile.PL inst-apps smoke/smoke.h smoke/Makefile.in smoke/Makefile.am smoke/tqt/qtguess.pl.in smoke/tqt/generate.pl.in smoke/tqt/qt_smoke.h smoke/tqt/generate_makefile_am.pl smoke/tqt/Makefile.am smoke/tqt/Makefile.in smoke/tqt/header_list kalyptus/Ast.pm kalyptus/kalyptus kalyptus/kalyptusDataDict.pm kalyptus/kdocParseDoc.pm kalyptus/Version kalyptus/ChangeLog kalyptus/kdocUtil.pm kalyptus/kdocAstUtil.pm kalyptus/README kalyptus/Iter.pm kalyptus/kalyptusCxxToSmoke.pm kalyptus/kdocLib.pm kalyptus/TODO doc/en/index.html doc/en/Makefile doc/en/PerlTQt.pod doc/fr/index.html doc/fr/Makefile doc/fr/PerlTQt.pod doc/css/pod.css doc/images/ex1.png doc/images/ex2.png doc/images/pqtsh.png # not a GNU package. You can remove this line, if # have all needed files, that a GNU package needs @@ -429,7 +429,7 @@ distcleancheck_listfiles = find . -type f -print distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) - $(mkinstalldirs) $(distdir)/PerlTQt $(distdir)/admin $(distdir)/doc/css $(distdir)/doc/en $(distdir)/doc/fr $(distdir)/doc/images $(distdir)/kalyptus $(distdir)/smoke $(distdir)/smoke/qt + $(mkinstalldirs) $(distdir)/PerlTQt $(distdir)/admin $(distdir)/doc/css $(distdir)/doc/en $(distdir)/doc/fr $(distdir)/doc/images $(distdir)/kalyptus $(distdir)/smoke $(distdir)/smoke/tqt @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ @@ -659,7 +659,7 @@ dist-hook: cd $(top_distdir) && $(MAKE) -f admin/Makefile.common subdirs test: - cd $(top_distdir) && LD_LIBRARY_PATH="../../smoke/qt/.libs:@qt_libraries@" PERL_DL_NONLAZY=1 perl test.pl + cd $(top_distdir) && LD_LIBRARY_PATH="../../smoke/tqt/.libs:@qt_libraries@" PERL_DL_NONLAZY=1 perl test.pl ChangeLog: perl cvs2cl.pl -P -S --no-wrap -f ChangeLog.CVS diff --git a/PerlTQt/INSTALL b/PerlTQt/INSTALL index da1c2dc..17b6faa 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 kde-perl-request@mail.kde.org. Please send patches and bug reports to the mailing-list. -This file contains instructions for downloading and building the SmokeQt +This file contains instructions for downloading and building the SmokeTQt library and PerlTQt. PerlTQt is not a direct Perl interface to the TQt -library, but is rather an interface to the SmokeQt library generated by +library, but is rather an interface to the SmokeTQt 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 smokeqt. +First, you need to download the development environment for smoketqt. Please use compression for cvs downloads ('cvs -z4' in .cvsrc). $ export CVSROOT=:pserver:anonymous@anoncvs.kde.org:/home/kde @@ -32,16 +32,16 @@ $ 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 smokeqt environment. The +At this point, you now have the full smoketqt 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. -$ cd smoke/qt # kdebindings/smoke/qt/ +$ cd smoke/tqt # kdebindings/smoke/tqt/ $ perl ./qtguess.pl # simple script to find disabled TQt features $ perl ./generate.pl # calls kalyptus which generates code -Now you have the SmokeQt source-code generated for your personal TQt +Now you have the SmokeTQt 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 libsmokeqt installed on your system. You can now +Okay, you now have libsmoketqt installed on your system. You can now compile PerlTQt. First, get the latest version of PerlTQt-3. $ export CVSROOT=:pserver:anonymous@cvs.perlqt.sf.net:/cvsroot/perlqt @@ -59,7 +59,7 @@ $ cvs login # no password $ cvs co PerlTQt-3 $ cd PerlTQt-3 # PerlTQt-3/ -If you installed libsmokeqt in a non-standard library path, you will +If you installed libsmoketqt 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 7746d30..bcf72af 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 -lsmokeqt ".'@LIBCRYPT@'." $qtlib"], + 'LIBS' => ['@all_libraries@'." -L$localsmoke -lsmoketqt ".'@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 -lsmokeqt\n/gs unless $i =~/-lsmokeqt/; + $i =~ s/((?:EXTRALIBS|LDLOADLIBS).*?)\n/$1 -L$localsmoke -lsmoketqt\n/gs unless $i =~/-lsmoketqt/; $i =~ s#(LD_RUN_PATH.*?)(${localsmoke})?\n#"$1".($2?"":":")."$x{'libdir'}\n"#se; $i; } diff --git a/configure.in b/configure.in index de5a5c4..33b21b3 100644 --- a/configure.in +++ b/configure.in @@ -235,8 +235,8 @@ dnl------------------------------- AC_DEFUN(KDE_CHECK_SMOKE, [ -AC_MSG_CHECKING(for SmokeQt) -AC_CACHE_VAL(kde_have_smokeqt, +AC_MSG_CHECKING(for SmokeTQt) +AC_CACHE_VAL(kde_have_smoketqt, [ kde_ldflags_safe="$LDFLAGS" @@ -246,7 +246,7 @@ AC_CACHE_VAL(kde_have_smokeqt, AC_LANG_SAVE AC_LANG_CPLUSPLUS - LIBS="-lsmokeqt" + LIBS="-lsmoketqt" 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_smokeqt, [ Smoke::Index i; ], - kde_have_smokeqt=yes, - kde_have_smokeqt=no + kde_have_smoketqt=yes, + kde_have_smoketqt=no ) LDFLAGS=$kde_ldflags_safe @@ -270,9 +270,9 @@ AC_CACHE_VAL(kde_have_smokeqt, AC_LANG_RESTORE -AC_MSG_RESULT($kde_have_smokeqt) +AC_MSG_RESULT($kde_have_smoketqt) -$1=$kde_have_smokeqt +$1=$kde_have_smoketqt ]) @@ -505,10 +505,10 @@ AC_SUBST(qt_test_threshold) if test "$HAVE_SMOKE" = "no" || test "$kde_force_smoke" != "no"; then - AC_CONFIG_FILES(smoke/qt/qtguess.pl, [cd smoke/qt && perl qtguess.pl && cd ../..] ) - AC_CONFIG_FILES(smoke/qt/generate.pl, [cd smoke/qt && perl generate.pl && cd ../..]) + AC_CONFIG_FILES(smoke/tqt/qtguess.pl, [cd smoke/tqt && perl qtguess.pl && cd ../..] ) + AC_CONFIG_FILES(smoke/tqt/generate.pl, [cd smoke/tqt && perl generate.pl && cd ../..]) AC_CONFIG_FILES([smoke/Makefile]) - AC_CONFIG_FILES([smoke/qt/Makefile]) + AC_CONFIG_FILES([smoke/tqt/Makefile]) fi AC_OUTPUT diff --git a/doc/en/PerlQt.pod b/doc/en/PerlQt.pod index a93256c..0f3ebe7 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 +L The SMOKE library (Scripting Meta Object Kompiler) is part of L's B 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 ffcb4d0..352240b 100644 --- a/doc/en/index.html +++ b/doc/en/index.html @@ -119,7 +119,7 @@ GNU tools : automake(>=1.5), autoconf (>=2.13), aclocal... TQt >= v3.0

  • -SmokeQt 1.2.1 +SmokeTQt 1.2.1 The SMOKE library (Scripting Meta Object Kompiler) is part of KDE's kdebindings 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 b59da51..2dc91fc 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 La librarie SMOKE (Scripting Meta Object Kompiler) fait partie du module L's B. Vous pouvez vérifier si diff --git a/doc/fr/index.html b/doc/fr/index.html index 3e4a3fe..0db306c 100644 --- a/doc/fr/index.html +++ b/doc/fr/index.html @@ -119,7 +119,7 @@ un syst TQt >= v3.0

  • -SmokeQt 1.2.1 La +SmokeTQt 1.2.1 La librarie SMOKE (Scripting Meta Object Kompiler) fait partie du module KDE's kdebindings. Vous pouvez vérifier si une version précompilée de ce module existe pour votre système. Mais diff --git a/smoke/Makefile.am b/smoke/Makefile.am index 49bd9d5..00d56b0 100644 --- a/smoke/Makefile.am +++ b/smoke/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = qt +SUBDIRS = tqt include_HEADERS = smoke.h diff --git a/smoke/Makefile.in b/smoke/Makefile.in index dfb559b..2df970f 100644 --- a/smoke/Makefile.in +++ b/smoke/Makefile.in @@ -193,7 +193,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ x_includes = @x_includes@ x_libraries = @x_libraries@ -SUBDIRS = qt +SUBDIRS = tqt include_HEADERS = smoke.h diff --git a/smoke/qt/Makefile.am b/smoke/tqt/Makefile.am similarity index 58% rename from smoke/qt/Makefile.am rename to smoke/tqt/Makefile.am index 63e4ec8..3614181 100644 --- a/smoke/qt/Makefile.am +++ b/smoke/tqt/Makefile.am @@ -1,4 +1,4 @@ -lib_LTLIBRARIES = libsmokeqt.la +lib_LTLIBRARIES = libsmoketqt.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. -libsmokeqt_la_LDFLAGS = -version-info 3:1:2 -no-undefined $(all_libraries) $(GL_CFLAGS) $(KDE_RPATH) +libsmoketqt_la_LDFLAGS = -version-info 3:1:2 -no-undefined $(all_libraries) $(GL_CFLAGS) $(KDE_RPATH) # the libraries to link against. -libsmokeqt_la_LIBADD = $(LIB_QT) $(GL_LIBS) +libsmoketqt_la_LIBADD = $(LIB_QT) $(GL_LIBS) # which sources should be compiled for perlqtkde -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 \ +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 \ 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/tqt/Makefile.in similarity index 87% rename from smoke/qt/Makefile.in rename to smoke/tqt/Makefile.in index 6a98cac..d2e8932 100644 --- a/smoke/qt/Makefile.in +++ b/smoke/tqt/Makefile.in @@ -193,7 +193,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ x_includes = @x_includes@ x_libraries = @x_libraries@ -lib_LTLIBRARIES = libsmokeqt.la +lib_LTLIBRARIES = libsmoketqt.la # set the include path for X, qt and KDE INCLUDES = -I$(srcdir)/.. $(all_includes) @@ -201,36 +201,36 @@ INCLUDES = -I$(srcdir)/.. $(all_includes) EXTRA_DIST = generate.pl.in qtguess.pl.in qt_smoke.h Makefile.am Makefile.in # the library search path. -#>- libsmokeqt_la_LDFLAGS = -version-info 3:1:2 -no-undefined $(all_libraries) $(GL_CFLAGS) $(KDE_RPATH) +#>- libsmoketqt_la_LDFLAGS = -version-info 3:1:2 -no-undefined $(all_libraries) $(GL_CFLAGS) $(KDE_RPATH) #>+ 1 -libsmokeqt_la_LDFLAGS = -version-info 3:1:2 -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries) $(GL_CFLAGS) $(KDE_RPATH) +libsmoketqt_la_LDFLAGS = -version-info 3:1:2 -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries) $(GL_CFLAGS) $(KDE_RPATH) # the libraries to link against. -libsmokeqt_la_LIBADD = $(LIB_QT) $(GL_LIBS) +libsmoketqt_la_LIBADD = $(LIB_QT) $(GL_LIBS) # which sources should be compiled for perlqtkde -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 \ +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 \ 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 -subdir = smoke/qt +subdir = smoke/tqt mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = qtguess.pl generate.pl LTLIBRARIES = $(lib_LTLIBRARIES) -libsmokeqt_la_DEPENDENCIES = -am_libsmokeqt_la_OBJECTS = smokedata.lo x_1.lo x_2.lo x_3.lo x_4.lo \ +libsmoketqt_la_DEPENDENCIES = +am_libsmoketqt_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 -#>- libsmokeqt_la_OBJECTS = $(am_libsmokeqt_la_OBJECTS) +#>- libsmoketqt_la_OBJECTS = $(am_libsmoketqt_la_OBJECTS) #>+ 6 -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 \ +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 \ 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@libsmokeqt_la_OBJECTS = $(libsmokeqt_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@libsmokeqt_la_OBJECTS = $(libsmokeqt_la_final_OBJECTS) +@KDE_USE_FINAL_FALSE@libsmoketqt_la_OBJECTS = $(libsmoketqt_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libsmoketqt_la_OBJECTS = $(libsmoketqt_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)/libsmokeqt_la.all_cpp.P ./$(DEPDIR)/smokedata.Plo ./$(DEPDIR)/x_1.Plo \ +@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@ @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 = $(libsmokeqt_la_SOURCES) +DIST_SOURCES = $(libsmoketqt_la_SOURCES) DIST_COMMON = Makefile.am Makefile.in generate.pl.in qtguess.pl.in -SOURCES = $(libsmokeqt_la_SOURCES) +SOURCES = $(libsmoketqt_la_SOURCES) #>- all: all-am #>+ 1 @@ -300,11 +300,11 @@ all: docs-am all-am .SUFFIXES: .cpp .lo .o .obj $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu smoke/qt/Makefile +#>- $(AUTOMAKE) --gnu smoke/tqt/Makefile #>+ 3 cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu smoke/qt/Makefile - cd $(top_srcdir) && perl admin/am_edit PerlTQt-3.008/smoke/qt/Makefile.in + $(AUTOMAKE) --gnu smoke/tqt/Makefile + cd $(top_srcdir) && perl admin/am_edit PerlTQt-3.008/smoke/tqt/Makefile.in Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) qtguess.pl: $(top_builddir)/config.status qtguess.pl.in @@ -339,11 +339,11 @@ clean-libLTLIBRARIES: echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -#>- libsmokeqt.la: $(libsmokeqt_la_OBJECTS) $(libsmokeqt_la_DEPENDENCIES) +#>- libsmoketqt.la: $(libsmoketqt_la_OBJECTS) $(libsmoketqt_la_DEPENDENCIES) #>+ 2 -@KDE_USE_CLOSURE_TRUE@libsmokeqt.la: libsmokeqt.la.closure $(libsmokeqt_la_OBJECTS) $(libsmokeqt_la_DEPENDENCIES) -@KDE_USE_CLOSURE_FALSE@libsmokeqt.la: $(libsmokeqt_la_OBJECTS) $(libsmokeqt_la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(libsmokeqt_la_LDFLAGS) $(libsmokeqt_la_OBJECTS) $(libsmokeqt_la_LIBADD) $(LIBS) +@KDE_USE_CLOSURE_TRUE@libsmoketqt.la: libsmoketqt.la.closure $(libsmoketqt_la_OBJECTS) $(libsmoketqt_la_DEPENDENCIES) +@KDE_USE_CLOSURE_FALSE@libsmoketqt.la: $(libsmoketqt_la_OBJECTS) $(libsmoketqt_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libsmoketqt_la_LDFLAGS) $(libsmoketqt_la_OBJECTS) $(libsmoketqt_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) core *.core @@ -611,17 +611,17 @@ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES #>+ 8 -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 +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 #>+ 3 clean-closures: - -rm -f libsmokeqt.la.closure + -rm -f libsmoketqt.la.closure #>+ 2 docs-am: @@ -629,8 +629,8 @@ docs-am: #>+ 6 force-reedit: cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu smoke/qt/Makefile - cd $(top_srcdir) && perl admin/am_edit PerlTQt-3.008/smoke/qt/Makefile.in + $(AUTOMAKE) --gnu smoke/tqt/Makefile + cd $(top_srcdir) && perl admin/am_edit PerlTQt-3.008/smoke/tqt/Makefile.in #>+ 9 @@ -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 -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; \ +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; \ 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\"" >> libsmokeqt_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libsmokeqt_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libsmoketqt_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libsmoketqt_la.all_cpp.final; \ done; \ - 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 + 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 #>+ 3 clean-final: - -rm -f libsmokeqt_la.all_cpp.cpp + -rm -f libsmoketqt_la.all_cpp.cpp #>+ 2 final: - $(MAKE) libsmokeqt_la_OBJECTS="$(libsmokeqt_la_final_OBJECTS)" all-am + $(MAKE) libsmoketqt_la_OBJECTS="$(libsmoketqt_la_final_OBJECTS)" all-am #>+ 2 final-install: - $(MAKE) libsmokeqt_la_OBJECTS="$(libsmokeqt_la_final_OBJECTS)" install-am + $(MAKE) libsmoketqt_la_OBJECTS="$(libsmoketqt_la_final_OBJECTS)" install-am #>+ 2 no-final: - $(MAKE) libsmokeqt_la_OBJECTS="$(libsmokeqt_la_nofinal_OBJECTS)" all-am + $(MAKE) libsmoketqt_la_OBJECTS="$(libsmoketqt_la_nofinal_OBJECTS)" all-am #>+ 2 no-final-install: - $(MAKE) libsmokeqt_la_OBJECTS="$(libsmokeqt_la_nofinal_OBJECTS)" install-am + $(MAKE) libsmoketqt_la_OBJECTS="$(libsmoketqt_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.pl.in b/smoke/tqt/generate.pl.in similarity index 100% rename from smoke/qt/generate.pl.in rename to smoke/tqt/generate.pl.in diff --git a/smoke/qt/generate_makefile_am.pl b/smoke/tqt/generate_makefile_am.pl similarity index 87% rename from smoke/qt/generate_makefile_am.pl rename to smoke/tqt/generate_makefile_am.pl index 49cdd49..8f528bd 100755 --- a/smoke/qt/generate_makefile_am.pl +++ b/smoke/tqt/generate_makefile_am.pl @@ -14,16 +14,16 @@ open( MAKEFILE, "<$outdir/Makefile.am" ) or die; my $makeFileData = ''; my $found = 0; while () { - if (/^libsmokeqt_la_SOURCES/) + if (/^libsmoketqt_la_SOURCES/) { $found = 1; - $makeFileData .= "libsmokeqt_la_SOURCES = smokedata.cpp"; + $makeFileData .= "libsmoketqt_la_SOURCES = smokedata.cpp"; } $makeFileData .= $_ if (!$found); } close MAKEFILE; -die "libsmokeqt_la_SOURCES not found" if (!$found); +die "libsmoketqt_la_SOURCES not found" if (!$found); open( MAKEFILE, ">$tempfile" ) or die; print MAKEFILE $makeFileData; diff --git a/smoke/qt/header_list b/smoke/tqt/header_list similarity index 100% rename from smoke/qt/header_list rename to smoke/tqt/header_list diff --git a/smoke/qt/qt_smoke.h b/smoke/tqt/qt_smoke.h similarity index 100% rename from smoke/qt/qt_smoke.h rename to smoke/tqt/qt_smoke.h diff --git a/smoke/qt/qtguess.pl.in b/smoke/tqt/qtguess.pl.in similarity index 100% rename from smoke/qt/qtguess.pl.in rename to smoke/tqt/qtguess.pl.in