By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 1269
Collapse All | Expand All

(-)libtqt-perl/INSTALL (-1 / +1 lines)
Lines 29-35 Link Here
29
--with-threshold=<0..15> : set the lever of standardness of your TQt
29
--with-threshold=<0..15> : set the lever of standardness of your TQt
30
                 library. Default is 10, which is reasonable.
30
                 library. Default is 10, which is reasonable.
31
                 If your TQt library is very customized, and you
31
                 If your TQt library is very customized, and you
32
                 experience missing symbols in libsmoketqt.so, 
32
                 experience missing symbols in libsmokeqt.so, 
33
                 set this to zero (paranoid level).
33
                 set this to zero (paranoid level).
34
====
34
====
35
35
(-)libtqt-perl/Makefile.PL (-1 / +1 lines)
Lines 100-106 Link Here
100
        "did not use the '--prefix=' commandline option.\n";
100
        "did not use the '--prefix=' commandline option.\n";
101
  print "KDE-3 isn't required at all. However, if it's installed on your system,\n".
101
  print "KDE-3 isn't required at all. However, if it's installed on your system,\n".
102
        "it is much better to specify it's location since PerlTQt uses (or build, if\n".
102
        "it is much better to specify it's location since PerlTQt uses (or build, if\n".
103
        "it can't find it) a KDE library named smoketqt.\n";
103
        "it can't find it) a KDE library named smokeqt.\n";
104
  print "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n\n";
104
  print "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n\n";
105
  sleep(5);
105
  sleep(5);
106
}
106
}
(-)libtqt-perl/PerlTQt/INSTALL (-7 / +7 lines)
Lines 4-12 Link Here
4
to kde-perl-request@mail.kde.org. Please send patches and bug reports
4
to kde-perl-request@mail.kde.org. Please send patches and bug reports
5
to the mailing-list.
5
to the mailing-list.
6
6
7
This file contains instructions for downloading and building the SmokeTQt
7
This file contains instructions for downloading and building the SmokeQt
8
library and PerlTQt. PerlTQt is not a direct Perl interface to the TQt
8
library and PerlTQt. PerlTQt is not a direct Perl interface to the TQt
9
library, but is rather an interface to the SmokeTQt library generated by
9
library, but is rather an interface to the SmokeQt library generated by
10
Kalyptus.
10
Kalyptus.
11
11
12
The programs+version I use, but not necessarily required:
12
The programs+version I use, but not necessarily required:
Lines 21-27 Link Here
21
I'm sorry for all the requirements, but you *are* getting this from 
21
I'm sorry for all the requirements, but you *are* getting this from 
22
CVS. Release versions will be much easier and more independant.
22
CVS. Release versions will be much easier and more independant.
23
23
24
First, you need to download the development environment for smoketqt.
24
First, you need to download the development environment for smokeqt.
25
Please use compression for cvs downloads ('cvs -z4' in .cvsrc).
25
Please use compression for cvs downloads ('cvs -z4' in .cvsrc).
26
26
27
$ export CVSROOT=:pserver:anonymous@anoncvs.kde.org:/home/kde
27
$ export CVSROOT=:pserver:anonymous@anoncvs.kde.org:/home/kde
Lines 32-38 Link Here
32
$ cd kdebindings              # kdebindings/
32
$ cd kdebindings              # kdebindings/
33
$ cvs co admin                # get kde build tools
33
$ cvs co admin                # get kde build tools
34
34
35
At this point, you now have the full smoketqt environment. The
35
At this point, you now have the full smokeqt environment. The
36
pre-generated smoke library is based off KDE's copy of TQt-3.0.4. I have
36
pre-generated smoke library is based off KDE's copy of TQt-3.0.4. I have
37
TQt-3.0.1, so I have to re-generate the files to match my installed 
37
TQt-3.0.1, so I have to re-generate the files to match my installed 
38
version of TQt. Here's how to do it.
38
version of TQt. Here's how to do it.
Lines 41-47 Link Here
41
$ perl ./qtguess.pl           # simple script to find disabled TQt features
41
$ perl ./qtguess.pl           # simple script to find disabled TQt features
42
$ perl ./generate.pl          # calls kalyptus which generates code
42
$ perl ./generate.pl          # calls kalyptus which generates code
43
43
44
Now you have the SmokeTQt source-code generated for your personal TQt
44
Now you have the SmokeQt source-code generated for your personal TQt
45
configuration. Here's how to compile.
45
configuration. Here's how to compile.
46
46
47
$ cd ../..                    # kdebindings/
47
$ cd ../..                    # kdebindings/
Lines 51-57 Link Here
51
$ make                        # this should succeed
51
$ make                        # this should succeed
52
$ make install                # will install to --prefix from configure
52
$ make install                # will install to --prefix from configure
53
53
54
Okay, you now have libsmoketqt installed on your system. You can now
54
Okay, you now have libsmokeqt installed on your system. You can now
55
compile PerlTQt. First, get the latest version of PerlTQt-3.
55
compile PerlTQt. First, get the latest version of PerlTQt-3.
56
56
57
$ export CVSROOT=:pserver:anonymous@cvs.perlqt.sf.net:/cvsroot/perlqt
57
$ export CVSROOT=:pserver:anonymous@cvs.perlqt.sf.net:/cvsroot/perlqt
Lines 59-65 Link Here
59
$ cvs co PerlTQt-3
59
$ cvs co PerlTQt-3
60
$ cd PerlTQt-3                 # PerlTQt-3/
60
$ cd PerlTQt-3                 # PerlTQt-3/
61
61
62
If you installed libsmoketqt in a non-standard library path, you will
62
If you installed libsmokeqt in a non-standard library path, you will
63
need to edit Makefile.PL and add -L/your/lib/path to the LIBS
63
need to edit Makefile.PL and add -L/your/lib/path to the LIBS
64
parameter. If any of the other options in Makefile.PL need changing for
64
parameter. If any of the other options in Makefile.PL need changing for
65
your system, you will need to change it now.
65
your system, you will need to change it now.
(-)libtqt-perl/PerlTQt/Makefile.PL.in (-2 / +2 lines)
Lines 85-91 Link Here
85
    'VERSION_FROM'	=> 'TQt.pm', # finds $VERSION
85
    'VERSION_FROM'	=> 'TQt.pm', # finds $VERSION
86
    'PREREQ_PM'		=> {}, # e.g., Module::Name => 1.1,
86
    'PREREQ_PM'		=> {}, # e.g., Module::Name => 1.1,
87
    'INC'		=> '@all_includes@ -I. -I../smoke',
87
    'INC'		=> '@all_includes@ -I. -I../smoke',
88
    'LIBS'		=> ['@all_libraries@'." -L$localsmoke -lsmoketqt ".'@LIBCRYPT@'." $qtlib"],
88
    'LIBS'		=> ['@all_libraries@'." -L$localsmoke -lsmokeqt ".'@LIBCRYPT@'." $qtlib"],
89
#   'XS'		=> {'TQt.xs' => 'TQt.cpp'}, # does not work ... still expects TQt.c 
89
#   'XS'		=> {'TQt.xs' => 'TQt.cpp'}, # does not work ... still expects TQt.c 
90
    'XSOPT'		=> "-C++",
90
    'XSOPT'		=> "-C++",
91
    'OBJECT'		=> "$objects",  # Object files
91
    'OBJECT'		=> "$objects",  # Object files
Lines 116-122 Link Here
116
                   package MY;
116
                   package MY;
117
                   my $i = shift->SUPER::const_loadlibs(@_);
117
                   my $i = shift->SUPER::const_loadlibs(@_);
118
                   # hacks for linking against a non-yet-installed smoke
118
                   # hacks for linking against a non-yet-installed smoke
119
                   $i =~ s/((?:EXTRALIBS|LDLOADLIBS).*?)\n/$1 -L$localsmoke -lsmoketqt\n/gs unless $i =~/-lsmoketqt/;
119
                   $i =~ s/((?:EXTRALIBS|LDLOADLIBS).*?)\n/$1 -L$localsmoke -lsmokeqt\n/gs unless $i =~/-lsmokeqt/;
120
                   $i =~ s#(LD_RUN_PATH.*?)(${localsmoke})?\n#"$1".($2?"":":")."$x{'libdir'}\n"#se;
120
                   $i =~ s#(LD_RUN_PATH.*?)(${localsmoke})?\n#"$1".($2?"":":")."$x{'libdir'}\n"#se;
121
                   $i;
121
                   $i;
122
}
122
}
(-)libtqt-perl/configure.in (-9 / +9 lines)
Lines 103-110 Link Here
103
[#try to guess kde locations
103
[#try to guess kde locations
104
104
105
dnl PQT
105
dnl PQT
106
kde_check_header="kdeversion.h"
106
kde_check_header="tdeversion.h"
107
kde_check_lib="libkdefx.la"
107
kde_check_lib="libtdefx.la"
108
dnl /PQT
108
dnl /PQT
109
109
110
if test -z "$1"; then
110
if test -z "$1"; then
Lines 235-242 Link Here
235
235
236
AC_DEFUN(KDE_CHECK_SMOKE,
236
AC_DEFUN(KDE_CHECK_SMOKE,
237
[
237
[
238
AC_MSG_CHECKING(for SmokeTQt)
238
AC_MSG_CHECKING(for SmokeQt)
239
AC_CACHE_VAL(kde_have_smoketqt,
239
AC_CACHE_VAL(kde_have_smokeqt,
240
[
240
[
241
241
242
 kde_ldflags_safe="$LDFLAGS"
242
 kde_ldflags_safe="$LDFLAGS"
Lines 246-252 Link Here
246
246
247
 AC_LANG_SAVE
247
 AC_LANG_SAVE
248
 AC_LANG_CPLUSPLUS
248
 AC_LANG_CPLUSPLUS
249
 LIBS="-lsmoketqt"
249
 LIBS="-lsmokeqt"
250
 CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes"
250
 CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes"
251
 LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
251
 LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
252
 LD_LIBRARY_PATH="$qt_libraries"
252
 LD_LIBRARY_PATH="$qt_libraries"
Lines 258-265 Link Here
258
 [
258
 [
259
   Smoke::Index i;
259
   Smoke::Index i;
260
 ],
260
 ],
261
  kde_have_smoketqt=yes,
261
  kde_have_smokeqt=yes,
262
  kde_have_smoketqt=no
262
  kde_have_smokeqt=no
263
 )
263
 )
264
264
265
 LDFLAGS=$kde_ldflags_safe
265
 LDFLAGS=$kde_ldflags_safe
Lines 270-278 Link Here
270
270
271
AC_LANG_RESTORE
271
AC_LANG_RESTORE
272
272
273
AC_MSG_RESULT($kde_have_smoketqt)
273
AC_MSG_RESULT($kde_have_smokeqt)
274
274
275
$1=$kde_have_smoketqt
275
$1=$kde_have_smokeqt
276
])
276
])
277
277
278
278
(-)libtqt-perl/doc/en/PerlQt.pod (-1 / +1 lines)
Lines 56-62 Link Here
56
56
57
=item *
57
=item *
58
58
59
L<SmokeTQt 1.2.1|"http://webcvs.kde.org/cgi-bin/cvsweb.cgi/kdebindings/smoke">
59
L<SmokeQt 1.2.1|"http://webcvs.kde.org/cgi-bin/cvsweb.cgi/kdebindings/smoke">
60
The SMOKE library (Scripting Meta Object Kompiler) is part of L<KDE|"http://www.kde.org">'s B<kdebindings> module.
60
The SMOKE library (Scripting Meta Object Kompiler) is part of L<KDE|"http://www.kde.org">'s B<kdebindings> module.
61
You may want to check if a precompiled version of this module exists for your
61
You may want to check if a precompiled version of this module exists for your
62
system.
62
system.
(-)libtqt-perl/doc/en/index.html (-1 / +1 lines)
Lines 119-125 Link Here
119
<a href="http://www.trolltech.com/developer/download/qtx11.html">TQt &gt;= v3.0</a>
119
<a href="http://www.trolltech.com/developer/download/qtx11.html">TQt &gt;= v3.0</a>
120
<p></p>
120
<p></p>
121
<li></li>
121
<li></li>
122
<a href="http://webcvs.kde.org/cgi-bin/cvsweb.cgi/kdebindings/smoke">SmokeTQt 1.2.1</a>
122
<a href="http://webcvs.kde.org/cgi-bin/cvsweb.cgi/kdebindings/smoke">SmokeQt 1.2.1</a>
123
The SMOKE library (Scripting Meta Object Kompiler) is part of <a href="http://www.kde.org">KDE</a>'s <strong>kdebindings</strong> module.
123
The SMOKE library (Scripting Meta Object Kompiler) is part of <a href="http://www.kde.org">KDE</a>'s <strong>kdebindings</strong> module.
124
You may want to check if a precompiled version of this module exists for your
124
You may want to check if a precompiled version of this module exists for your
125
system.
125
system.
(-)libtqt-perl/doc/fr/PerlQt.pod (-1 / +1 lines)
Lines 57-63 Link Here
57
57
58
=item *
58
=item *
59
59
60
L<SmokeTQt
60
L<SmokeQt
61
1.2.1|"http://webcvs.kde.org/cgi-bin/cvsweb.cgi/kdebindings/smoke"> La
61
1.2.1|"http://webcvs.kde.org/cgi-bin/cvsweb.cgi/kdebindings/smoke"> La
62
librarie SMOKE  (Scripting Meta Object Kompiler) fait partie du module
62
librarie SMOKE  (Scripting Meta Object Kompiler) fait partie du module
63
L<KDE|"http://www.kde.org">'s B<kdebindings>.  Vous pouvez vérifier si
63
L<KDE|"http://www.kde.org">'s B<kdebindings>.  Vous pouvez vérifier si
(-)libtqt-perl/doc/fr/index.html (-1 / +1 lines)
Lines 119-125 Link Here
119
<a href="http://www.trolltech.com/developer/download/qtx11.html">TQt &gt;= v3.0</a>
119
<a href="http://www.trolltech.com/developer/download/qtx11.html">TQt &gt;= v3.0</a>
120
<p></p>
120
<p></p>
121
<li></li>
121
<li></li>
122
<a href="http://webcvs.kde.org/cgi-bin/cvsweb.cgi/kdebindings/smoke">SmokeTQt 1.2.1</a> La
122
<a href="http://webcvs.kde.org/cgi-bin/cvsweb.cgi/kdebindings/smoke">SmokeQt 1.2.1</a> La
123
librarie SMOKE  (Scripting Meta Object Kompiler) fait partie du module
123
librarie SMOKE  (Scripting Meta Object Kompiler) fait partie du module
124
<a href="http://www.kde.org">KDE</a>'s <strong>kdebindings</strong>.  Vous pouvez vérifier si
124
<a href="http://www.kde.org">KDE</a>'s <strong>kdebindings</strong>.  Vous pouvez vérifier si
125
une version précompilée de ce module existe pour votre système. Mais
125
une version précompilée de ce module existe pour votre système. Mais
(-)libtqt-perl/smoke/qt/Makefile.am (-4 / +4 lines)
Lines 1-4 Link Here
1
lib_LTLIBRARIES = libsmoketqt.la
1
lib_LTLIBRARIES = libsmokeqt.la
2
2
3
# set the include path for X, qt and KDE
3
# set the include path for X, qt and KDE
4
INCLUDES         = -I$(srcdir)/.. $(all_includes)
4
INCLUDES         = -I$(srcdir)/.. $(all_includes)
Lines 6-17 Link Here
6
EXTRA_DIST=generate.pl.in qtguess.pl.in qt_smoke.h Makefile.am Makefile.in
6
EXTRA_DIST=generate.pl.in qtguess.pl.in qt_smoke.h Makefile.am Makefile.in
7
7
8
# the library search path. 
8
# the library search path. 
9
libsmoketqt_la_LDFLAGS = -version-info 3:1:2 -no-undefined $(all_libraries) $(GL_CFLAGS) $(KDE_RPATH)
9
libsmokeqt_la_LDFLAGS = -version-info 3:1:2 -no-undefined $(all_libraries) $(GL_CFLAGS) $(KDE_RPATH)
10
10
11
# the libraries to link against.
11
# the libraries to link against.
12
libsmoketqt_la_LIBADD   = $(LIB_QT) $(GL_LIBS)
12
libsmokeqt_la_LIBADD   = $(LIB_QT) $(GL_LIBS)
13
13
14
# which sources should be compiled for perlqtkde
14
# which sources should be compiled for perlqtkde
15
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 \
15
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 \
16
 x_8.cpp x_9.cpp x_10.cpp x_11.cpp x_12.cpp x_13.cpp x_14.cpp x_15.cpp \
16
 x_8.cpp x_9.cpp x_10.cpp x_11.cpp x_12.cpp x_13.cpp x_14.cpp x_15.cpp \
17
 x_16.cpp x_17.cpp x_18.cpp x_19.cpp x_20.cpp
17
 x_16.cpp x_17.cpp x_18.cpp x_19.cpp x_20.cpp
(-)libtqt-perl/smoke/qt/Makefile.in (-39 / +39 lines)
Lines 193-199 Link Here
193
target_alias = @target_alias@
193
target_alias = @target_alias@
194
x_includes = @x_includes@
194
x_includes = @x_includes@
195
x_libraries = @x_libraries@
195
x_libraries = @x_libraries@
196
lib_LTLIBRARIES = libsmoketqt.la
196
lib_LTLIBRARIES = libsmokeqt.la
197
197
198
# set the include path for X, qt and KDE
198
# set the include path for X, qt and KDE
199
INCLUDES = -I$(srcdir)/.. $(all_includes)
199
INCLUDES = -I$(srcdir)/.. $(all_includes)
Lines 201-215 Link Here
201
EXTRA_DIST = generate.pl.in qtguess.pl.in qt_smoke.h Makefile.am Makefile.in
201
EXTRA_DIST = generate.pl.in qtguess.pl.in qt_smoke.h Makefile.am Makefile.in
202
202
203
# the library search path. 
203
# the library search path. 
204
#>- libsmoketqt_la_LDFLAGS = -version-info 3:1:2 -no-undefined $(all_libraries) $(GL_CFLAGS) $(KDE_RPATH)
204
#>- libsmokeqt_la_LDFLAGS = -version-info 3:1:2 -no-undefined $(all_libraries) $(GL_CFLAGS) $(KDE_RPATH)
205
#>+ 1
205
#>+ 1
206
libsmoketqt_la_LDFLAGS = -version-info 3:1:2 -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries) $(GL_CFLAGS) $(KDE_RPATH)
206
libsmokeqt_la_LDFLAGS = -version-info 3:1:2 -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries) $(GL_CFLAGS) $(KDE_RPATH)
207
207
208
# the libraries to link against.
208
# the libraries to link against.
209
libsmoketqt_la_LIBADD = $(LIB_QT) $(GL_LIBS)
209
libsmokeqt_la_LIBADD = $(LIB_QT) $(GL_LIBS)
210
210
211
# which sources should be compiled for perlqtkde
211
# which sources should be compiled for perlqtkde
212
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 \
212
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 \
213
 x_8.cpp x_9.cpp x_10.cpp x_11.cpp x_12.cpp x_13.cpp x_14.cpp x_15.cpp \
213
 x_8.cpp x_9.cpp x_10.cpp x_11.cpp x_12.cpp x_13.cpp x_14.cpp x_15.cpp \
214
 x_16.cpp x_17.cpp x_18.cpp x_19.cpp x_20.cpp
214
 x_16.cpp x_17.cpp x_18.cpp x_19.cpp x_20.cpp
215
215
Lines 219-236 Link Here
219
CONFIG_CLEAN_FILES = qtguess.pl generate.pl
219
CONFIG_CLEAN_FILES = qtguess.pl generate.pl
220
LTLIBRARIES = $(lib_LTLIBRARIES)
220
LTLIBRARIES = $(lib_LTLIBRARIES)
221
221
222
libsmoketqt_la_DEPENDENCIES =
222
libsmokeqt_la_DEPENDENCIES =
223
am_libsmoketqt_la_OBJECTS = smokedata.lo x_1.lo x_2.lo x_3.lo x_4.lo \
223
am_libsmokeqt_la_OBJECTS = smokedata.lo x_1.lo x_2.lo x_3.lo x_4.lo \
224
	x_5.lo x_6.lo x_7.lo x_8.lo x_9.lo x_10.lo x_11.lo x_12.lo \
224
	x_5.lo x_6.lo x_7.lo x_8.lo x_9.lo x_10.lo x_11.lo x_12.lo \
225
	x_13.lo x_14.lo x_15.lo x_16.lo x_17.lo x_18.lo x_19.lo x_20.lo
225
	x_13.lo x_14.lo x_15.lo x_16.lo x_17.lo x_18.lo x_19.lo x_20.lo
226
#>- libsmoketqt_la_OBJECTS = $(am_libsmoketqt_la_OBJECTS)
226
#>- libsmokeqt_la_OBJECTS = $(am_libsmokeqt_la_OBJECTS)
227
#>+ 6
227
#>+ 6
228
libsmoketqt_la_final_OBJECTS = libsmoketqt_la.all_cpp.lo 
228
libsmokeqt_la_final_OBJECTS = libsmokeqt_la.all_cpp.lo 
229
libsmoketqt_la_nofinal_OBJECTS = smokedata.lo x_1.lo x_2.lo x_3.lo x_4.lo \
229
libsmokeqt_la_nofinal_OBJECTS = smokedata.lo x_1.lo x_2.lo x_3.lo x_4.lo \
230
	x_5.lo x_6.lo x_7.lo x_8.lo x_9.lo x_10.lo x_11.lo x_12.lo \
230
	x_5.lo x_6.lo x_7.lo x_8.lo x_9.lo x_10.lo x_11.lo x_12.lo \
231
	x_13.lo x_14.lo x_15.lo x_16.lo x_17.lo x_18.lo x_19.lo x_20.lo
231
	x_13.lo x_14.lo x_15.lo x_16.lo x_17.lo x_18.lo x_19.lo x_20.lo
232
@KDE_USE_FINAL_FALSE@libsmoketqt_la_OBJECTS = $(libsmoketqt_la_nofinal_OBJECTS)
232
@KDE_USE_FINAL_FALSE@libsmokeqt_la_OBJECTS = $(libsmokeqt_la_nofinal_OBJECTS)
233
@KDE_USE_FINAL_TRUE@libsmoketqt_la_OBJECTS = $(libsmoketqt_la_final_OBJECTS)
233
@KDE_USE_FINAL_TRUE@libsmokeqt_la_OBJECTS = $(libsmokeqt_la_final_OBJECTS)
234
234
235
DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
235
DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
236
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
236
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
Lines 247-253 Link Here
247
#>- @AMDEP_TRUE@	./$(DEPDIR)/x_7.Plo ./$(DEPDIR)/x_8.Plo \
247
#>- @AMDEP_TRUE@	./$(DEPDIR)/x_7.Plo ./$(DEPDIR)/x_8.Plo \
248
#>- @AMDEP_TRUE@	./$(DEPDIR)/x_9.Plo
248
#>- @AMDEP_TRUE@	./$(DEPDIR)/x_9.Plo
249
#>+ 23
249
#>+ 23
250
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =   $(DEPDIR)/libsmoketqt_la.all_cpp.P  ./$(DEPDIR)/smokedata.Plo ./$(DEPDIR)/x_1.Plo \
250
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =   $(DEPDIR)/libsmokeqt_la.all_cpp.P  ./$(DEPDIR)/smokedata.Plo ./$(DEPDIR)/x_1.Plo \
251
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/x_10.Plo ./$(DEPDIR)/x_11.Plo \
251
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/x_10.Plo ./$(DEPDIR)/x_11.Plo \
252
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/x_12.Plo ./$(DEPDIR)/x_13.Plo \
252
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/x_12.Plo ./$(DEPDIR)/x_13.Plo \
253
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/x_14.Plo ./$(DEPDIR)/x_15.Plo \
253
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/x_14.Plo ./$(DEPDIR)/x_15.Plo \
Lines 288-296 Link Here
288
#>+ 2
288
#>+ 2
289
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
289
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
290
	$(AM_LDFLAGS) $(LDFLAGS) -o $@
290
	$(AM_LDFLAGS) $(LDFLAGS) -o $@
291
DIST_SOURCES = $(libsmoketqt_la_SOURCES)
291
DIST_SOURCES = $(libsmokeqt_la_SOURCES)
292
DIST_COMMON = Makefile.am Makefile.in generate.pl.in qtguess.pl.in
292
DIST_COMMON = Makefile.am Makefile.in generate.pl.in qtguess.pl.in
293
SOURCES = $(libsmoketqt_la_SOURCES)
293
SOURCES = $(libsmokeqt_la_SOURCES)
294
294
295
#>- all: all-am
295
#>- all: all-am
296
#>+ 1
296
#>+ 1
Lines 339-349 Link Here
339
	  echo "rm -f \"$${dir}/so_locations\""; \
339
	  echo "rm -f \"$${dir}/so_locations\""; \
340
	  rm -f "$${dir}/so_locations"; \
340
	  rm -f "$${dir}/so_locations"; \
341
	done
341
	done
342
#>- libsmoketqt.la: $(libsmoketqt_la_OBJECTS) $(libsmoketqt_la_DEPENDENCIES) 
342
#>- libsmokeqt.la: $(libsmokeqt_la_OBJECTS) $(libsmokeqt_la_DEPENDENCIES) 
343
#>+ 2
343
#>+ 2
344
@KDE_USE_CLOSURE_TRUE@libsmoketqt.la: libsmoketqt.la.closure $(libsmoketqt_la_OBJECTS) $(libsmoketqt_la_DEPENDENCIES) 
344
@KDE_USE_CLOSURE_TRUE@libsmokeqt.la: libsmokeqt.la.closure $(libsmokeqt_la_OBJECTS) $(libsmokeqt_la_DEPENDENCIES) 
345
@KDE_USE_CLOSURE_FALSE@libsmoketqt.la: $(libsmoketqt_la_OBJECTS) $(libsmoketqt_la_DEPENDENCIES) 
345
@KDE_USE_CLOSURE_FALSE@libsmokeqt.la: $(libsmokeqt_la_OBJECTS) $(libsmokeqt_la_DEPENDENCIES) 
346
	$(CXXLINK) -rpath $(libdir) $(libsmoketqt_la_LDFLAGS) $(libsmoketqt_la_OBJECTS) $(libsmoketqt_la_LIBADD) $(LIBS)
346
	$(CXXLINK) -rpath $(libdir) $(libsmokeqt_la_LDFLAGS) $(libsmokeqt_la_OBJECTS) $(libsmokeqt_la_LIBADD) $(LIBS)
347
347
348
mostlyclean-compile:
348
mostlyclean-compile:
349
	-rm -f *.$(OBJEXT) core *.core
349
	-rm -f *.$(OBJEXT) core *.core
Lines 611-627 Link Here
611
611
612
612
613
#>+ 8
613
#>+ 8
614
libsmoketqt.la.closure: $(libsmoketqt_la_OBJECTS) $(libsmoketqt_la_DEPENDENCIES)
614
libsmokeqt.la.closure: $(libsmokeqt_la_OBJECTS) $(libsmokeqt_la_DEPENDENCIES)
615
	@echo "int main() {return 0;}" > libsmoketqt_la_closure.cpp
615
	@echo "int main() {return 0;}" > libsmokeqt_la_closure.cpp
616
	@$(LTCXXCOMPILE) -c libsmoketqt_la_closure.cpp
616
	@$(LTCXXCOMPILE) -c libsmokeqt_la_closure.cpp
617
	$(CXXLINK) libsmoketqt_la_closure.lo $(libsmoketqt_la_LDFLAGS) $(libsmoketqt_la_OBJECTS) $(libsmoketqt_la_LIBADD) $(LIBS)
617
	$(CXXLINK) libsmokeqt_la_closure.lo $(libsmokeqt_la_LDFLAGS) $(libsmokeqt_la_OBJECTS) $(libsmokeqt_la_LIBADD) $(LIBS)
618
	@rm -f libsmoketqt_la_closure.* libsmoketqt.la.closure
618
	@rm -f libsmokeqt_la_closure.* libsmokeqt.la.closure
619
	@echo "timestamp" > libsmoketqt.la.closure
619
	@echo "timestamp" > libsmokeqt.la.closure
620
620
621
621
622
#>+ 3
622
#>+ 3
623
clean-closures:
623
clean-closures:
624
	-rm -f  libsmoketqt.la.closure
624
	-rm -f  libsmokeqt.la.closure
625
625
626
#>+ 2
626
#>+ 2
627
docs-am:
627
docs-am:
Lines 644-676 Link Here
644
	test ! -s bchecktest.cc.oldclass || test ! -s bchecktest.cc.class || cmp -s bchecktest.cc.oldclass bchecktest.cc.class
644
	test ! -s bchecktest.cc.oldclass || test ! -s bchecktest.cc.class || cmp -s bchecktest.cc.oldclass bchecktest.cc.class
645
645
646
#>+ 11
646
#>+ 11
647
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 
647
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 
648
	@echo 'creating libsmoketqt_la.all_cpp.cpp ...'; \
648
	@echo 'creating libsmokeqt_la.all_cpp.cpp ...'; \
649
	rm -f libsmoketqt_la.all_cpp.files libsmoketqt_la.all_cpp.final; \
649
	rm -f libsmokeqt_la.all_cpp.files libsmokeqt_la.all_cpp.final; \
650
	echo "#define KDE_USE_FINAL 1" >> libsmoketqt_la.all_cpp.final; \
650
	echo "#define KDE_USE_FINAL 1" >> libsmokeqt_la.all_cpp.final; \
651
	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 \
651
	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 \
652
	  echo "#include \"$$file\"" >> libsmoketqt_la.all_cpp.files; \
652
	  echo "#include \"$$file\"" >> libsmokeqt_la.all_cpp.files; \
653
	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libsmoketqt_la.all_cpp.final; \
653
	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libsmokeqt_la.all_cpp.final; \
654
	done; \
654
	done; \
655
	cat libsmoketqt_la.all_cpp.final libsmoketqt_la.all_cpp.files > libsmoketqt_la.all_cpp.cpp; \
655
	cat libsmokeqt_la.all_cpp.final libsmokeqt_la.all_cpp.files > libsmokeqt_la.all_cpp.cpp; \
656
	rm -f libsmoketqt_la.all_cpp.final libsmoketqt_la.all_cpp.files
656
	rm -f libsmokeqt_la.all_cpp.final libsmokeqt_la.all_cpp.files
657
657
658
#>+ 3
658
#>+ 3
659
clean-final:
659
clean-final:
660
	-rm -f libsmoketqt_la.all_cpp.cpp
660
	-rm -f libsmokeqt_la.all_cpp.cpp
661
661
662
#>+ 2
662
#>+ 2
663
final:
663
final:
664
	$(MAKE) libsmoketqt_la_OBJECTS="$(libsmoketqt_la_final_OBJECTS)" all-am
664
	$(MAKE) libsmokeqt_la_OBJECTS="$(libsmokeqt_la_final_OBJECTS)" all-am
665
#>+ 2
665
#>+ 2
666
final-install:
666
final-install:
667
	$(MAKE) libsmoketqt_la_OBJECTS="$(libsmoketqt_la_final_OBJECTS)" install-am
667
	$(MAKE) libsmokeqt_la_OBJECTS="$(libsmokeqt_la_final_OBJECTS)" install-am
668
#>+ 2
668
#>+ 2
669
no-final:
669
no-final:
670
	$(MAKE) libsmoketqt_la_OBJECTS="$(libsmoketqt_la_nofinal_OBJECTS)" all-am
670
	$(MAKE) libsmokeqt_la_OBJECTS="$(libsmokeqt_la_nofinal_OBJECTS)" all-am
671
#>+ 2
671
#>+ 2
672
no-final-install:
672
no-final-install:
673
	$(MAKE) libsmoketqt_la_OBJECTS="$(libsmoketqt_la_nofinal_OBJECTS)" install-am
673
	$(MAKE) libsmokeqt_la_OBJECTS="$(libsmokeqt_la_nofinal_OBJECTS)" install-am
674
#>+ 3
674
#>+ 3
675
cvs-clean:
675
cvs-clean:
676
	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
676
	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
(-)libtqt-perl/smoke/qt/generate_makefile_am.pl (-3 / +3 lines)
Lines 14-29 Link Here
14
my $makeFileData = '';
14
my $makeFileData = '';
15
my $found = 0;
15
my $found = 0;
16
while (<MAKEFILE>) {
16
while (<MAKEFILE>) {
17
	if (/^libsmoketqt_la_SOURCES/)
17
	if (/^libsmokeqt_la_SOURCES/)
18
	{
18
	{
19
		$found = 1;
19
		$found = 1;
20
		$makeFileData .= "libsmoketqt_la_SOURCES = smokedata.cpp";
20
		$makeFileData .= "libsmokeqt_la_SOURCES = smokedata.cpp";
21
	}
21
	}
22
	$makeFileData .= $_ if (!$found);
22
	$makeFileData .= $_ if (!$found);
23
}
23
}
24
close MAKEFILE;
24
close MAKEFILE;
25
25
26
die "libsmoketqt_la_SOURCES not found" if (!$found);
26
die "libsmokeqt_la_SOURCES not found" if (!$found);
27
27
28
open( MAKEFILE, ">$tempfile" ) or die;
28
open( MAKEFILE, ">$tempfile" ) or die;
29
print MAKEFILE $makeFileData;
29
print MAKEFILE $makeFileData;

Return to bug 1269