diff options
| -rw-r--r-- | korundum/bin/Makefile.am | 4 | ||||
| -rw-r--r-- | korundum/rubylib/korundum/Korundum.cpp | 2 | ||||
| -rw-r--r-- | korundum/rubylib/korundum/Makefile.am | 2 | ||||
| -rw-r--r-- | smoke/README | 2 | ||||
| -rw-r--r-- | smoke/configure.in.in | 4 | ||||
| -rw-r--r-- | smoke/qt/configure.in.in | 2 | ||||
| -rw-r--r-- | smoke/tde/Makefile.am (renamed from smoke/kde/Makefile.am) | 10 | ||||
| -rw-r--r-- | smoke/tde/configure.in.in (renamed from smoke/kde/configure.in.in) | 8 | ||||
| -rw-r--r-- | smoke/tde/generate.pl.in (renamed from smoke/kde/generate.pl.in) | 0 | ||||
| -rwxr-xr-x | smoke/tde/generate_makefile_am.pl (renamed from smoke/kde/generate_makefile_am.pl) | 0 | ||||
| -rw-r--r-- | smoke/tde/header_list (renamed from smoke/kde/header_list) | 0 | ||||
| -rw-r--r-- | smoke/tde/hint_header_list.pl (renamed from smoke/kde/hint_header_list.pl) | 0 | ||||
| -rw-r--r-- | smoke/tde/kde_header_list (renamed from smoke/kde/kde_header_list) | 0 | ||||
| -rw-r--r-- | smoke/tde/qt_smoke.h (renamed from smoke/kde/qt_smoke.h) | 0 | ||||
| -rw-r--r-- | smoke/tde/qtguess.pl.in (renamed from smoke/kde/qtguess.pl.in) | 0 |
15 files changed, 17 insertions, 17 deletions
diff --git a/korundum/bin/Makefile.am b/korundum/bin/Makefile.am index 69813941..ef682c09 100644 --- a/korundum/bin/Makefile.am +++ b/korundum/bin/Makefile.am @@ -1,10 +1,10 @@ INCLUDES = $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS) bin_PROGRAMS = krubyinit -krubyinit_LDFLAGS = -module $(all_libraries) -version-info 0:0:0 -L$(top_srcdir)/smoke/kde/ -L$(RUBY_LIBDIR) -ltdemdi -lknewstuff +krubyinit_LDFLAGS = -module $(all_libraries) -version-info 0:0:0 -L$(top_srcdir)/smoke/tde/ -L$(RUBY_LIBDIR) -ltdemdi -lknewstuff krubyinit_METASOURCES = AUTO krubyinit_SOURCES = krubyinit.cpp -krubyinit_LDADD = $(LIB_KDE) $(RUBY_LIBRUBYARG) $(top_builddir)/smoke/kde/libsmokekde.la $(top_builddir)/qtruby/rubylib/qtruby/libqtrubyinternal.la +krubyinit_LDADD = $(LIB_KDE) $(RUBY_LIBRUBYARG) $(top_builddir)/smoke/tde/libsmoketde.la $(top_builddir)/qtruby/rubylib/qtruby/libqtrubyinternal.la install-exec-local: @-rm -f $(DESTDIR)$(bindir)/rbkdeapi diff --git a/korundum/rubylib/korundum/Korundum.cpp b/korundum/rubylib/korundum/Korundum.cpp index 9e0ab7a2..d0d2b48d 100644 --- a/korundum/rubylib/korundum/Korundum.cpp +++ b/korundum/rubylib/korundum/Korundum.cpp @@ -1161,7 +1161,7 @@ Init_korundum() set_kde_resolve_classname(kde_resolve_classname); // The Qt extension is linked against libsmokeqt.so, but Korundum links against - // libsmokekde.so only. Specifying both a 'require Qt' and a 'require Korundum', + // libsmoketde.so only. Specifying both a 'require Qt' and a 'require Korundum', // would give a link error (see the rb_fatal() error above). // So call the Init_qtruby() initialization function explicitely, not via 'require Qt' // (Qt.o is linked into libqtruby.so, as well as the Qt.so extension). diff --git a/korundum/rubylib/korundum/Makefile.am b/korundum/rubylib/korundum/Makefile.am index 541e3f55..85797c62 100644 --- a/korundum/rubylib/korundum/Makefile.am +++ b/korundum/rubylib/korundum/Makefile.am @@ -5,6 +5,6 @@ rubylib_LTLIBRARIES = korundum.la korundum_la_LDFLAGS = -module $(all_libraries) -version-info 0:0:0 korundum_la_METASOURCES = AUTO korundum_la_SOURCES = Korundum.cpp kdehandlers.cpp -korundum_la_LIBADD = $(LIB_KDE) $(top_builddir)/smoke/kde/libsmokekde.la $(top_builddir)/qtruby/rubylib/qtruby/libqtrubyinternal.la +korundum_la_LIBADD = $(LIB_KDE) $(top_builddir)/smoke/tde/libsmoketde.la $(top_builddir)/qtruby/rubylib/qtruby/libqtrubyinternal.la SUBDIRS = lib diff --git a/smoke/README b/smoke/README index d38cdcb9..0964a7a6 100644 --- a/smoke/README +++ b/smoke/README @@ -1,6 +1,6 @@ SMOKE stands for "Scripting Meta Object Kompiler Engine" - for instance ;) -This directory compiles a smokeqt (and later a smokekde) library, which +This directory compiles a smokeqt (and later a smoketde) library, which contain interfaces to (almost) all Qt and KDE classes. The next PerlQt/PerlKDE will be based on SMOKE. However SMOKE is language-independent enough for other bindings (e.g. to diff --git a/smoke/configure.in.in b/smoke/configure.in.in index ab6a6942..2dbf9253 100644 --- a/smoke/configure.in.in +++ b/smoke/configure.in.in @@ -1,8 +1,8 @@ AC_ARG_WITH( smoke, - [ --with-smoke@<:@=qt|kde@:>@ Smoke: build Smoke for qt+kde or qt only @<:@default:qt kde@:>@], + [ --with-smoke@<:@=qt|kde@:>@ Smoke: build Smoke for qt+tde or qt only @<:@default:qt tde@:>@], [ kde_build_libsmoke="$withval" ], - [ kde_build_libsmoke="qt kde" ] + [ kde_build_libsmoke="qt tde" ] ) AC_SUBST(kde_build_libsmoke) diff --git a/smoke/qt/configure.in.in b/smoke/qt/configure.in.in index 9f79c912..3ea9d09e 100644 --- a/smoke/qt/configure.in.in +++ b/smoke/qt/configure.in.in @@ -15,7 +15,7 @@ AC_ARG_WITH( ) AC_SUBST(qt_test_threshold) -if test "X$kde_build_libsmoke" = "Xqt" -o "X$kde_build_libsmoke" = "Xqt kde"; then +if test "X$kde_build_libsmoke" = "Xqt" -o "X$kde_build_libsmoke" = "Xqt tde"; then AC_CONFIG_FILES([ smoke/qt/qtguess.pl ], [ cd smoke/qt diff --git a/smoke/kde/Makefile.am b/smoke/tde/Makefile.am index a211ad8b..9c85ccc1 100644 --- a/smoke/kde/Makefile.am +++ b/smoke/tde/Makefile.am @@ -1,4 +1,4 @@ -lib_LTLIBRARIES = libsmokekde.la +lib_LTLIBRARIES = libsmoketde.la # set the include path for X, qt and KDE INCLUDES = -I$(srcdir)/.. $(all_includes) @@ -6,19 +6,19 @@ INCLUDES = -I$(srcdir)/.. $(all_includes) EXTRA_DIST=generate.pl.in qtguess.pl.in qt_smoke.h Makefile.am # the library search path. -libsmokekde_la_LDFLAGS = -version-info 3:2:2 -no-undefined $(all_libraries) $(GLINC) $(KDE_RPATH) +libsmoketde_la_LDFLAGS = -version-info 3:2:2 -no-undefined $(all_libraries) $(GLINC) $(KDE_RPATH) # the libraries to link against. -libsmokekde_la_LIBADD = $(LIB_TDEHTML) -lkjs -lfontconfig $(LIB_KMDI) $(LIB_KNS) $(LIB_KSPELL) $(LIB_KUTILS) $(LIB_TDEPRINT) $(GLLIB) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KIO) $(LIB_KPARTS) -lDCOP -ltdefx +libsmoketde_la_LIBADD = $(LIB_TDEHTML) -lkjs -lfontconfig $(LIB_KMDI) $(LIB_KNS) $(LIB_KSPELL) $(LIB_KUTILS) $(LIB_TDEPRINT) $(GLLIB) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KIO) $(LIB_KPARTS) -lDCOP -ltdefx x_sources = 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 # which sources should be compiled for perlqtkde -libsmokekde_la_SOURCES = $(x_sources) smokedata.cpp +libsmoketde_la_SOURCES = $(x_sources) smokedata.cpp $(x_sources) smokedata.cpp: perl generate.pl -CLEANFILES = $(libsmokekde_la_SOURCES) +CLEANFILES = $(libsmoketde_la_SOURCES) diff --git a/smoke/kde/configure.in.in b/smoke/tde/configure.in.in index 04b58b33..7cca7173 100644 --- a/smoke/kde/configure.in.in +++ b/smoke/tde/configure.in.in @@ -10,14 +10,14 @@ AC_SUBST(KDE_HAVE_GL) KDE_PREFIX=`$KDECONFIG --prefix --expandvars` AC_SUBST(KDE_PREFIX) -if test "X$kde_build_libsmoke" = "Xkde" -o "X$kde_build_libsmoke" = "Xqt kde"; then +if test "X$kde_build_libsmoke" = "Xtde" -o "X$kde_build_libsmoke" = "Xqt tde"; then - AC_CONFIG_FILES([ smoke/kde/qtguess.pl ], [ - cd smoke/kde + AC_CONFIG_FILES([ smoke/tde/qtguess.pl ], [ + cd smoke/tde perl qtguess.pl cd ../.. ]) - AC_CONFIG_FILES([ smoke/kde/generate.pl ], [ + AC_CONFIG_FILES([ smoke/tde/generate.pl ], [ ]) fi diff --git a/smoke/kde/generate.pl.in b/smoke/tde/generate.pl.in index 1dfd3fd5..1dfd3fd5 100644 --- a/smoke/kde/generate.pl.in +++ b/smoke/tde/generate.pl.in diff --git a/smoke/kde/generate_makefile_am.pl b/smoke/tde/generate_makefile_am.pl index 03f51747..03f51747 100755 --- a/smoke/kde/generate_makefile_am.pl +++ b/smoke/tde/generate_makefile_am.pl diff --git a/smoke/kde/header_list b/smoke/tde/header_list index ffa24c70..ffa24c70 100644 --- a/smoke/kde/header_list +++ b/smoke/tde/header_list diff --git a/smoke/kde/hint_header_list.pl b/smoke/tde/hint_header_list.pl index ff9c86b7..ff9c86b7 100644 --- a/smoke/kde/hint_header_list.pl +++ b/smoke/tde/hint_header_list.pl diff --git a/smoke/kde/kde_header_list b/smoke/tde/kde_header_list index f6491c4f..f6491c4f 100644 --- a/smoke/kde/kde_header_list +++ b/smoke/tde/kde_header_list diff --git a/smoke/kde/qt_smoke.h b/smoke/tde/qt_smoke.h index 8859c243..8859c243 100644 --- a/smoke/kde/qt_smoke.h +++ b/smoke/tde/qt_smoke.h diff --git a/smoke/kde/qtguess.pl.in b/smoke/tde/qtguess.pl.in index 89b8aa39..89b8aa39 100644 --- a/smoke/kde/qtguess.pl.in +++ b/smoke/tde/qtguess.pl.in |