diff options
Diffstat (limited to 'qtruby')
| -rw-r--r-- | qtruby/INSTALL | 2 | ||||
| -rw-r--r-- | qtruby/bin/Makefile.am | 4 | ||||
| -rw-r--r-- | qtruby/rubylib/designer/uilib/extconf.rb | 2 | ||||
| -rw-r--r-- | qtruby/rubylib/qtruby/Makefile.am | 2 | ||||
| -rw-r--r-- | qtruby/rubylib/qtruby/extconf.rb | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/qtruby/INSTALL b/qtruby/INSTALL index f2b39996..94fc7787 100644 --- a/qtruby/INSTALL +++ b/qtruby/INSTALL @@ -47,7 +47,7 @@ Build Qt/Mac and install in /Developer/qt. These configure flags work well: Configure QtRuby and build the Smoke library: $ ./configure '--with-qt-dir=/Developer/qt' '--enable-mac' -$ cd smoke/qt +$ cd smoke/tqt # Generate the Smoke library sources: $ perl generate.pl # Overwrite the automake generated Makefile: diff --git a/qtruby/bin/Makefile.am b/qtruby/bin/Makefile.am index 0e1dbdba..ac39aeb2 100644 --- a/qtruby/bin/Makefile.am +++ b/qtruby/bin/Makefile.am @@ -1,9 +1,9 @@ INCLUDES = $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS) bin_PROGRAMS = qtrubyinit -qtrubyinit_LDFLAGS = -module $(all_libraries) -version-info 0:0:0 -L$(top_srcdir)/smoke/qt/ -L$(RUBY_LIBDIR) +qtrubyinit_LDFLAGS = -module $(all_libraries) -version-info 0:0:0 -L$(top_srcdir)/smoke/tqt/ -L$(RUBY_LIBDIR) qtrubyinit_METASOURCES = AUTO qtrubyinit_SOURCES = qtrubyinit.cpp -qtrubyinit_LDADD = $(LIB_QT) $(RUBY_LIBRUBYARG) $(top_builddir)/smoke/qt/libsmokeqt.la $(top_builddir)/qtruby/rubylib/qtruby/libqtrubyinternal.la +qtrubyinit_LDADD = $(LIB_QT) $(RUBY_LIBRUBYARG) $(top_builddir)/smoke/tqt/libsmoketqt.la $(top_builddir)/qtruby/rubylib/qtruby/libqtrubyinternal.la bin_SCRIPTS = rbqtapi rbqtsh diff --git a/qtruby/rubylib/designer/uilib/extconf.rb b/qtruby/rubylib/designer/uilib/extconf.rb index b7d10117..ac5410a6 100644 --- a/qtruby/rubylib/designer/uilib/extconf.rb +++ b/qtruby/rubylib/designer/uilib/extconf.rb @@ -2,5 +2,5 @@ require 'mkmf' dir_config('smoke') dir_config('qt') $CPPFLAGS += " -I../../../../smoke -I../../qtruby " -$LOCAL_LIBS += '-bundle_loader ../../qtruby/qtruby.bundle -lsmokeqt -ltqui -ltqt-mt -lstdc++' +$LOCAL_LIBS += '-bundle_loader ../../qtruby/qtruby.bundle -lsmoketqt -ltqui -ltqt-mt -lstdc++' create_makefile("tqui") diff --git a/qtruby/rubylib/qtruby/Makefile.am b/qtruby/rubylib/qtruby/Makefile.am index 56b320f1..55612005 100644 --- a/qtruby/rubylib/qtruby/Makefile.am +++ b/qtruby/rubylib/qtruby/Makefile.am @@ -10,6 +10,6 @@ rubylibdir = $(RUBY_ARCHDIR) rubylib_LTLIBRARIES = qtruby.la qtruby_la_SOURCES = qtruby_la_LDFLAGS = -module $(all_libraries) -version-info 0:0:0 -qtruby_la_LIBADD = libqtrubyinternal.la $(LIB_QT) $(top_builddir)/smoke/qt/libsmokeqt.la +qtruby_la_LIBADD = libqtrubyinternal.la $(LIB_QT) $(top_builddir)/smoke/tqt/libsmoketqt.la SUBDIRS = lib diff --git a/qtruby/rubylib/qtruby/extconf.rb b/qtruby/rubylib/qtruby/extconf.rb index fdcbdd83..9e2f9f96 100644 --- a/qtruby/rubylib/qtruby/extconf.rb +++ b/qtruby/rubylib/qtruby/extconf.rb @@ -1,5 +1,5 @@ require 'mkmf' dir_config('smoke') dir_config('qt') -$LOCAL_LIBS += '-lsmokeqt -ltqt-mt -lstdc++' +$LOCAL_LIBS += '-lsmoketqt -ltqt-mt -lstdc++' create_makefile("qtruby") |