[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-bindings
Subject: [Kde-bindings] builddir != sourcedir fixes
From: "Richard L=?ISO-8859-1?Q?=E4rk=E4ng"?= <nouseforaname () home ! se>
Date: 2003-12-26 20:11:34
[Download RAW message or body]
Hi!
After quite a bit of patching I got kdebindings to build with srcdir != builddir.
The patches mostly are adding $(srcdir) in front of paths, but there are some others too.
But I can't compile kdejava without editing the Makefile, in kdejava/koala/org/kde/koala i get this:
make: execvp: /bin/sh: Argument list too long
make: *** [classjava.stamp] Error 127
I can get around this by removing the if at the beginning and the "else :; fi" at the end in:
classjava.stamp: $(java_JAVA)
@if test -n "$?"; then \
echo '$(CLASSPATH_ENV) $(JAVAC) -d $(JAVAROOT) $(AM_JAVACFLAGS) $(JAVACFLAGS) $?' ; \
$(CLASSPATH_ENV) $(JAVAC) -d $(JAVAROOT) \
$(AM_JAVACFLAGS) $(JAVACFLAGS) $?; \
else :; fi
echo timestamp > classjava.stamp
But I have no idea how to solve this.
Also I added some configure checks for ruby and disabling the build of the ruby bindings
if it couldn't be found.
Can I commit this?
Please CC me as I'm not subscribed to this list
Richard Lärkäng
["kdebindings.patch" (application/octet-stream)]
Index: dcopperl/Makefile.PL.in
===================================================================
RCS file: /home/kde/kdebindings/dcopperl/Makefile.PL.in,v
retrieving revision 1.1
diff -u -p -b -B -r1.1 Makefile.PL.in
--- dcopperl/Makefile.PL.in 12 Jan 2003 21:15:42 -0000 1.1
+++ dcopperl/Makefile.PL.in 26 Dec 2003 15:25:19 -0000
@@ -11,7 +11,7 @@ my $qt_lib = "@qt_libraries@";
WriteMakefile(
NAME => 'DCOP',
- VERSION_FROM => 'DCOP.pm',
+ VERSION_FROM => '@srcdir@/DCOP.pm',
INC => "-I$qt_inc -I$kde_inc",
LIBS => "-L$qt_lib -lqt-mt -L$kde_lib -lkdecore -lDCOP",
XS => {'DCOP.xs' => 'DCOP.cpp'},
Index: dcopperl/configure.in.in
===================================================================
RCS file: /home/kde/kdebindings/dcopperl/configure.in.in,v
retrieving revision 1.1
diff -u -p -b -B -r1.1 configure.in.in
--- dcopperl/configure.in.in 14 Jan 2003 21:03:41 -0000 1.1
+++ dcopperl/configure.in.in 26 Dec 2003 15:25:19 -0000
@@ -1,7 +1,7 @@
KDE_CHECK_PERL(5.005, dcopperl)
AC_CONFIG_FILES([ dcopperl/Makefile.PL ], [
cd dcopperl
- perl Makefile.PL
+ perl -I$srcdir Makefile.PL
cd ..
])
Index: kdejava/koala/Makefile.am
===================================================================
RCS file: /home/kde/kdebindings/kdejava/koala/Makefile.am,v
retrieving revision 1.14
diff -u -p -b -B -r1.14 Makefile.am
--- kdejava/koala/Makefile.am 26 May 2002 22:26:03 -0000 1.14
+++ kdejava/koala/Makefile.am 26 Dec 2003 15:25:19 -0000
@@ -36,7 +36,7 @@ INCLUDES= $(all_includes)
koala_METASOURCES = AUTO
# the library search path.
-koala_LDFLAGS = $(all_libraries) -L../../qtjava/javalib/qtjava $(KDE_RPATH)
+koala_LDFLAGS = $(all_libraries) $(KDE_RPATH)
# them while "make clean", use CLEANFILES
DISTCLEANFILES = $(koala_METASOURCES)
Index: kdejava/koala/org/kde/koala/Makefile.am
===================================================================
RCS file: /home/kde/kdebindings/kdejava/koala/org/kde/koala/Makefile.am,v
retrieving revision 1.33
diff -u -p -b -B -r1.33 Makefile.am
--- kdejava/koala/org/kde/koala/Makefile.am 23 Dec 2003 03:54:29 -0000 1.33
+++ kdejava/koala/org/kde/koala/Makefile.am 26 Dec 2003 15:25:20 -0000
@@ -10,7 +10,7 @@ javadir = $(kde_libraries)/java/org/kde/
install-data-hook: uninstall-javaJAVA
JAVAROOT = ../../..
-CLASSPATH = ../../..:../../../../../qtjava/javalib:$(srcdir)
+CLASSPATH = $(srcdir)/../../..:$(srcdir)/../../../../../qtjava/javalib:$(srcdir)
JAVACFLAGS = -classpath $(CLASSPATH)
# Prevent stupid automake from putting JAVAC=javac in Makefile.in
JAVAC = @JAVAC@
Index: kjsembed/builtins/Makefile.am
===================================================================
RCS file: /home/kde/kdebindings/kjsembed/builtins/Makefile.am,v
retrieving revision 1.5
diff -u -p -b -B -r1.5 Makefile.am
--- kjsembed/builtins/Makefile.am 12 Dec 2003 20:18:54 -0000 1.5
+++ kjsembed/builtins/Makefile.am 26 Dec 2003 15:25:20 -0000
@@ -1,4 +1,4 @@
-INCLUDES= -I$(srcdir)/../.. -I.. $(all_includes)
+INCLUDES= -I$(srcdir)/../.. -I.. -I$(top_srcdir)/kjsembed $(all_includes)
KDE_CXXFLAGS = -DQT_NO_ASCII_CAST -DQT_CLEAN_NAMESPACE
noinst_LTLIBRARIES = libkjsembedbuiltins.la
Index: kjsembed/plugin/Makefile.am
===================================================================
RCS file: /home/kde/kdebindings/kjsembed/plugin/Makefile.am,v
retrieving revision 1.2
diff -u -p -b -B -r1.2 Makefile.am
--- kjsembed/plugin/Makefile.am 14 Nov 2003 11:08:43 -0000 1.2
+++ kjsembed/plugin/Makefile.am 26 Dec 2003 15:25:20 -0000
@@ -1,7 +1,7 @@
# -*- makefile -*-
# Make sure the include path includes Qt's uilib
-INCLUDES= -I$(QTDIR)/tools/designer/uilib -I$(srcdir)/.. -I.. $(all_includes)
+INCLUDES= -I$(QTDIR)/tools/designer/uilib -I$(srcdir)/.. -I.. -I$(top_srcdir) \
$(all_includes)
INCLUDES += -DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST
Index: korundum/rubylib/korundum/configure.in.in
===================================================================
RCS file: /home/kde/kdebindings/korundum/rubylib/korundum/configure.in.in,v
retrieving revision 1.1
diff -u -p -b -B -r1.1 configure.in.in
--- korundum/rubylib/korundum/configure.in.in 2 Dec 2003 00:25:54 -0000 1.1
+++ korundum/rubylib/korundum/configure.in.in 26 Dec 2003 15:25:20 -0000
@@ -1,9 +1,15 @@
-AC_MSG_CHECKING(for ruby dirs)
-RUBY_ARCHDIR=`ruby -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'`
-RUBY_SITEARCHDIR=`ruby -r rbconfig -e \
'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'`
-RUBY_SITEDIR=`ruby -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'`
-AC_MSG_RESULT([archdir $RUBY_ARCHDIR, sitearchdir $RUBY_SITEARCHDIR, sitedir \
$RUBY_SITEDIR])
-AC_SUBST(RUBY_ARCHDIR)
-AC_SUBST(RUBY_SITEARCHDIR)
-AC_SUBST(RUBY_SITEDIR)
+AC_CHECK_PROG(RUBY, ruby, ruby)
+
+if test -z "$RUBY"; then
+ DO_NOT_COMPILE="$DO_NOT_COMPILE korundum"
+else
+ AC_MSG_CHECKING(for ruby dirs)
+ RUBY_ARCHDIR=`ruby -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'`
+ RUBY_SITEARCHDIR=`ruby -r rbconfig -e \
'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'` + RUBY_SITEDIR=`ruby -r rbconfig \
-e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'` + AC_MSG_RESULT([archdir \
$RUBY_ARCHDIR, sitearchdir $RUBY_SITEARCHDIR, sitedir $RUBY_SITEDIR]) + \
AC_SUBST(RUBY_ARCHDIR) + AC_SUBST(RUBY_SITEARCHDIR)
+ AC_SUBST(RUBY_SITEDIR)
+fi
Index: qtjava/javalib/docs/en/Makefile.am
===================================================================
RCS file: /home/kde/kdebindings/qtjava/javalib/docs/en/Makefile.am,v
retrieving revision 1.2
diff -u -p -b -B -r1.2 Makefile.am
--- qtjava/javalib/docs/en/Makefile.am 7 Dec 2001 18:04:23 -0000 1.2
+++ qtjava/javalib/docs/en/Makefile.am 26 Dec 2003 15:25:20 -0000
@@ -4,28 +4,22 @@
EXTRA_DIST = index.html index-1.html index-2.html index-3.html index-4.html \
index-5.html index-6.html
install-data-local:
- $(mkinstalldirs) $(prefix)/doc/javalib/
- $(INSTALL_DATA) $(srcdir)/index.html $(prefix)/doc/javalib/index.html
- $(mkinstalldirs) $(prefix)/doc/javalib/
- $(INSTALL_DATA) $(srcdir)/index-1.html $(prefix)/doc/javalib/index-1.html
- $(mkinstalldirs) $(prefix)/doc/javalib/
- $(INSTALL_DATA) $(srcdir)/index-2.html $(prefix)/doc/javalib/index-2.html
- $(mkinstalldirs) $(prefix)/doc/javalib/
- $(INSTALL_DATA) $(srcdir)/index-3.html $(prefix)/doc/javalib/index-3.html
- $(mkinstalldirs) $(prefix)/doc/javalib/
- $(INSTALL_DATA) $(srcdir)/index-4.html $(prefix)/doc/javalib/index-4.html
- $(mkinstalldirs) $(prefix)/doc/javalib/
- $(INSTALL_DATA) $(srcdir)/index-5.html $(prefix)/doc/javalib/index-5.html
- $(mkinstalldirs) $(prefix)/doc/javalib/
- $(INSTALL_DATA) $(srcdir)/index-6.html $(prefix)/doc/javalib/index-6.html
+ $(mkinstalldirs) $(DESTDIR)$(prefix)/doc/javalib/
+ $(INSTALL_DATA) $(srcdir)/index.html $(DESTDIR)$(prefix)/doc/javalib/index.html
+ $(INSTALL_DATA) $(srcdir)/index-1.html $(DESTDIR)$(prefix)/doc/javalib/index-1.html
+ $(INSTALL_DATA) $(srcdir)/index-2.html $(DESTDIR)$(prefix)/doc/javalib/index-2.html
+ $(INSTALL_DATA) $(srcdir)/index-3.html $(DESTDIR)$(prefix)/doc/javalib/index-3.html
+ $(INSTALL_DATA) $(srcdir)/index-4.html $(DESTDIR)$(prefix)/doc/javalib/index-4.html
+ $(INSTALL_DATA) $(srcdir)/index-5.html $(DESTDIR)$(prefix)/doc/javalib/index-5.html
+ $(INSTALL_DATA) $(srcdir)/index-6.html $(DESTDIR)$(prefix)/doc/javalib/index-6.html
uninstall-local:
- -rm -f $(prefix)/doc/javalib/index.html
- -rm -f $(prefix)/doc/javalib/index-1.html
- -rm -f $(prefix)/doc/javalib/index-2.html
- -rm -f $(prefix)/doc/javalib/index-3.html
- -rm -f $(prefix)/doc/javalib/index-4.html
- -rm -f $(prefix)/doc/javalib/index-5.html
- -rm -f $(prefix)/doc/javalib/index-6.html
+ -rm -f $(DESTDIR)$(prefix)/doc/javalib/index.html
+ -rm -f $(DESTDIR)$(prefix)/doc/javalib/index-1.html
+ -rm -f $(DESTDIR)$(prefix)/doc/javalib/index-2.html
+ -rm -f $(DESTDIR)$(prefix)/doc/javalib/index-3.html
+ -rm -f $(DESTDIR)$(prefix)/doc/javalib/index-4.html
+ -rm -f $(DESTDIR)$(prefix)/doc/javalib/index-5.html
+ -rm -f $(DESTDIR)$(prefix)/doc/javalib/index-6.html
####### kdevelop will overwrite this part!!! (end)############
Index: qtjava/javalib/org/kde/qt/Makefile.am
===================================================================
RCS file: /home/kde/kdebindings/qtjava/javalib/org/kde/qt/Makefile.am,v
retrieving revision 1.17
diff -u -p -b -B -r1.17 Makefile.am
--- qtjava/javalib/org/kde/qt/Makefile.am 22 Dec 2003 23:11:08 -0000 1.17
+++ qtjava/javalib/org/kde/qt/Makefile.am 26 Dec 2003 15:25:20 -0000
@@ -10,7 +10,7 @@ java_JAVA = $(EXTRA_DIST)
install-data-hook: uninstall-javaJAVA
JAVAROOT = ../../..
-CLASSPATH = ../../..
+CLASSPATH = $(srcdir)/../../..
JAVACFLAGS = -classpath $(CLASSPATH)
# Prevent stupid automake from putting JAVAC=javac in Makefile.in
JAVAC = @JAVAC@
Index: qtruby/rubylib/qtruby/Makefile.am
===================================================================
RCS file: /home/kde/kdebindings/qtruby/rubylib/qtruby/Makefile.am,v
retrieving revision 1.11
diff -u -p -b -B -r1.11 Makefile.am
--- qtruby/rubylib/qtruby/Makefile.am 16 Oct 2003 01:17:39 -0000 1.11
+++ qtruby/rubylib/qtruby/Makefile.am 26 Dec 2003 15:25:20 -0000
@@ -12,4 +12,5 @@ libqtruby_la_LIBADD = $(LIB_QT) $(top_bu
SUBDIRS = lib
install-data-local:
- cp .libs/libqtruby.so $(RUBY_SITEARCHDIR)/Qt.so
+ $(mkinstalldirs) $(DESTDIR)$(RUBY_SITEARCHDIR)
+ cp .libs/libqtruby.so $(DESTDIR)$(RUBY_SITEARCHDIR)/Qt.so
Index: qtruby/rubylib/qtruby/configure.in.in
===================================================================
RCS file: /home/kde/kdebindings/qtruby/rubylib/qtruby/configure.in.in,v
retrieving revision 1.4
diff -u -p -b -B -r1.4 configure.in.in
--- qtruby/rubylib/qtruby/configure.in.in 3 Aug 2003 12:24:25 -0000 1.4
+++ qtruby/rubylib/qtruby/configure.in.in 26 Dec 2003 15:25:20 -0000
@@ -1,9 +1,15 @@
-AC_MSG_CHECKING(for ruby dirs)
-RUBY_ARCHDIR=`ruby -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'`
-RUBY_SITEARCHDIR=`ruby -r rbconfig -e \
'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'`
-RUBY_SITEDIR=`ruby -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'`
-AC_MSG_RESULT([archdir $RUBY_ARCHDIR, sitearchdir $RUBY_SITEARCHDIR, sitedir \
$RUBY_SITEDIR])
-AC_SUBST(RUBY_ARCHDIR)
-AC_SUBST(RUBY_SITEARCHDIR)
-AC_SUBST(RUBY_SITEDIR)
+AC_CHECK_PROG(RUBY, ruby, ruby)
+
+if test -z "$RUBY"; then
+ DO_NOT_COMPILE="$DO_NOT_COMPILE qtruby"
+else
+ AC_MSG_CHECKING(for ruby dirs)
+ RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'`
+ RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e \
'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'` + RUBY_SITEDIR=`$RUBY -r \
rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'` + \
AC_MSG_RESULT([archdir $RUBY_ARCHDIR, sitearchdir $RUBY_SITEARCHDIR, sitedir \
$RUBY_SITEDIR]) + AC_SUBST(RUBY_ARCHDIR)
+ AC_SUBST(RUBY_SITEARCHDIR)
+ AC_SUBST(RUBY_SITEDIR)
+fi
Index: smoke/qt/generate.pl.in
===================================================================
RCS file: /home/kde/kdebindings/smoke/qt/generate.pl.in,v
retrieving revision 1.4
diff -u -p -b -B -r1.4 generate.pl.in
--- smoke/qt/generate.pl.in 16 Oct 2003 01:38:00 -0000 1.4
+++ smoke/qt/generate.pl.in 26 Dec 2003 15:25:21 -0000
@@ -14,7 +14,7 @@ my $here = getcwd;
my $outdir = $here . "/generate.pl.tmpdir";
my $finaloutdir = $here;
my $defines = "qtdefines";
-my $headerlist = "header_list";
+my $headerlist = "@srcdir@/header_list";
my $definespath = "$here/$defines";
my $headerlistpath = "$here/$headerlist";
@@ -32,6 +32,7 @@ if ( -e $definespath ){
$macros = " --defines=$definespath ";
}
+mkdir $kalyptusdir, 0777;
# Need to cd to kalyptus's directory so that perl finds Ast.pm etc.
chdir "$kalyptusdir" or die "Couldn't go to $kalyptusdir (edit script to change \
dir)\n";
@@ -110,9 +111,11 @@ foreach $filename (readdir(QT)) {
closedir QT;
# Launch kalyptus
-system "perl kalyptus @ARGV --globspace -fsmoke --name=qt $macros --no-cache \
--outputdir=$outdir @headers"; +chdir "../smoke/qt";
+system "perl -I@top_srcdir@/kalyptus @top_srcdir@/kalyptus/kalyptus @ARGV \
--globspace -fsmoke --name=qt $macros --no-cache --outputdir=$outdir @headers"; my \
$exit = $? >> 8; exit $exit if ($exit);
+chdir "$kalyptusdir";
# Generate diff for smokedata.cpp
unless ( -e "$finaloutdir/smokedata.cpp" ) {
_______________________________________________
Kde-bindings mailing list
Kde-bindings@kde.org
https://mail.kde.org/mailman/listinfo/kde-bindings
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic