Patches to Beta 4.1 for Solaris(?) and src/build directory
Stefan Becker
Stefan.Becker at nokia.com
Thu Nov 4 13:25:24 GMT 1999
Hi!
I've tried to compile 1.0 Beta 4.1 for Solaris 2.7. There are two
problems:
a) Linking with -lfl doesn't work.
Solution: use "%option C++ noyywrap" and drop -lfl
b) Source != Build directory is not fully supported yet. Those parts
which are automatically generated by automake work OK already, but
the manual parts have to be fixed up.
Solution: Correct the corresponding lines in Makefile.am
(I have sent in the manual patches to Makefile.in), e.g.:
install-data-local:
$(mkinstalldirs) $(APPSDIR)/Development
-> $(INSTALL_DATA) kdevelop.kdelnk $(APPSDIR)/Development
to
install-data-local:
$(mkinstalldirs) $(APPSDIR)/Development
-> $(INSTALL_DATA) $(srcdir)/kdevelop.kdelnk $(APPSDIR)/Development
NOTE: The same solution has to be applied to the doc subdirectory
too!
Regards,
Stefan
---
Stefan Becker
E-Mail: Stefan.Becker at nokia.com
-------------- next part --------------
--- kdevelop-1.0beta4.1/kdevelop/classparser/tokenizer.l~ Wed Oct 20 22:09:39 1999
+++ kdevelop-1.0beta4.1/kdevelop/classparser/tokenizer.l Thu Nov 4 13:32:22 1999
@@ -60,6 +60,7 @@
%option yylineno
%option C++ yymore
+%option C++ noyywrap
%%
/*==============> Strip whitespace <==============*/
--- kdevelop-1.0beta4.1/kdevelop/tools/Makefile.in~ Sat Oct 30 17:07:38 1999
+++ kdevelop-1.0beta4.1/kdevelop/tools/Makefile.in Thu Nov 4 13:00:27 1999
@@ -301,8 +301,8 @@
maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-processes.pl: processes.pl.in
- cp processes.pl.in processes.pl
+processes.pl: $(srcdir)/processes.pl.in
+ cp $(srcdir)/processes.pl.in processes.pl
perl -npi -e 's%^\$$templatedir = _;$$%\$$templatedir = \"'${kde_datadir}'/kdevelop/templates\";%g;' \
processes.pl
perl -npi -e 's%^\$$kde_icondir = _;$$%\$$kde_icondir = \"'${kde_icondir}'\";%g;' \
--- kdevelop-1.0beta4.1/kdevelop/classparser/Makefile.in~ Sat Oct 30 17:07:38 1999
+++ kdevelop-1.0beta4.1/kdevelop/classparser/Makefile.in Thu Nov 4 13:33:23 1999
@@ -411,8 +411,8 @@
maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-tokenizer.cc: tokenizer.l
- $(LEX) -+ -otokenizer.cc tokenizer.l
+tokenizer.cc: $(srcdir)/tokenizer.l
+ $(LEX) -+ -o$(srcdir)/tokenizer.cc $(srcdir)/tokenizer.l
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
--- kdevelop-1.0beta4.1/kdevelop/Makefile.in~ Sat Oct 30 17:07:38 1999
+++ kdevelop-1.0beta4.1/kdevelop/Makefile.in Thu Nov 4 13:48:11 1999
@@ -206,7 +206,7 @@
kdevelop_LDFLAGS = $(all_libraries) $(KDE_RPATH)
# the libraries to link against. Be aware of the order. First the libraries,
# that depend on the following ones.
-kdevelop_LDADD = ./vc/libvc.a ./print/libprint.a ./gfxview/libgfxview.a ./kdlgedit/libkdlgedit.a ./kwrite/libkwrite.a ./classparser/libclassparser.a ./classwizard/libclasswizard.a -lkfile -lkfm -lkspell $(LIB_KHTMLW) -lkdeui -lkdecore -lqt -lXext -lX11 $(LIBSOCKET) -lfl -ldb -ldl
+kdevelop_LDADD = ./vc/libvc.a ./print/libprint.a ./gfxview/libgfxview.a ./kdlgedit/libkdlgedit.a ./kwrite/libkwrite.a ./classparser/libclassparser.a ./classwizard/libclasswizard.a -lkfile -lkfm -lkspell $(LIB_KHTMLW) -lkdeui -lkdecore -lqt -lXext -lX11 $(LIBSOCKET) -ldb -ldl
# this option you can leave out. Just, if you use "make dist", you need it
noinst_HEADERS = ckdevelop.h cnewfiledlg.h ceditwidget.h coutputwidget.h ctabctl.h ckdevsetupdlg.h cprjoptionsdlg.h crealfileview.h clogfileview.h structdef.h cdocbrowser.h cproject.h cclassview.h kswallow.h cgeneratenewfile.h doctreeview.h cnewclassdlg.h cfilepropdlg.h caddexistingfiledlg.h cgrouppropertiesdlg.h cupdatekdedocdlg.h resource.h kdevelop.kdelnk ckappwizard.h ccreatedocdatabasedlg.h ctoolclass.h cdoctreepropdlg.h debug.h cfinddoctextdlg.h kstartuplogo.h ktipofday.h ckdevinstall.h caddclassmethoddlg.h caddclassattributedlg.h cclasstooldlg.h cclasstreehandler.h ctreehandler.h ctreeview.h cerrormessageparser.h cexecuteargdlg.h ccvaddfolderdlg.h klangcombo.h caddnewtranslationdlg.h grepdialog.h ctoolsconfigdlg.h cbugreportdlg.h cclasstooltreeview.h cmakemanualdlg.h klistview.h ckdevaccel.h
@@ -581,40 +581,40 @@
$(mkinstalldirs) $(DESTDIR)$(APPSDIR)/Development
#>- $(INSTALL_DATA) kdevelop.kdelnk $(APPSDIR)/Development
#>+ 1
- $(INSTALL_DATA) kdevelop.kdelnk $(DESTDIR)$(APPSDIR)/Development
+ $(INSTALL_DATA) $(srcdir)/kdevelop.kdelnk $(DESTDIR)$(APPSDIR)/Development
#>- $(INSTALL_DATA) kdevelop-setup.kdelnk $(APPSDIR)/Development
#>+ 1
- $(INSTALL_DATA) kdevelop-setup.kdelnk $(DESTDIR)$(APPSDIR)/Development
+ $(INSTALL_DATA) $(srcdir)/kdevelop-setup.kdelnk $(DESTDIR)$(APPSDIR)/Development
#>- $(INSTALL_DATA) .directory $(APPSDIR)/Development
#>+ 1
- $(INSTALL_DATA) .directory $(DESTDIR)$(APPSDIR)/Development
+ $(INSTALL_DATA) $(srcdir)/.directory $(DESTDIR)$(APPSDIR)/Development
#>- $(mkinstalldirs) $(kde_icondir)
#>+ 1
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)
#>- $(INSTALL_DATA) kdevelop.xpm $(kde_icondir)
#>+ 1
- $(INSTALL_DATA) kdevelop.xpm $(DESTDIR)$(kde_icondir)
+ $(INSTALL_DATA) $(srcdir)/kdevelop.xpm $(DESTDIR)$(kde_icondir)
#>- $(INSTALL_DATA) kdevelop-project.xpm $(kde_icondir)
#>+ 1
- $(INSTALL_DATA) kdevelop-project.xpm $(DESTDIR)$(kde_icondir)
+ $(INSTALL_DATA) $(srcdir)/kdevelop-project.xpm $(DESTDIR)$(kde_icondir)
#>- $(mkinstalldirs) $(kde_minidir)
#>+ 1
$(mkinstalldirs) $(DESTDIR)$(kde_minidir)
#>- $(INSTALL_DATA) mini-kdevelop.xpm $(kde_minidir)/kdevelop.xpm
#>+ 1
- $(INSTALL_DATA) mini-kdevelop.xpm $(DESTDIR)$(kde_minidir)/kdevelop.xpm
+ $(INSTALL_DATA) $(srcdir)/mini-kdevelop.xpm $(DESTDIR)$(kde_minidir)/kdevelop.xpm
#>- $(mkinstalldirs) $(kde_confdir)
#>+ 1
$(mkinstalldirs) $(DESTDIR)$(kde_confdir)
#>- $(INSTALL_DATA) kdeveloprc $(kde_confdir)/kdeveloprc
#>+ 1
- $(INSTALL_DATA) kdeveloprc $(DESTDIR)$(kde_confdir)/kdeveloprc
+ $(INSTALL_DATA) $(srcdir)/kdeveloprc $(DESTDIR)$(kde_confdir)/kdeveloprc
#>- $(mkinstalldirs) $(kde_mimedir)/application
#>+ 1
$(mkinstalldirs) $(DESTDIR)$(kde_mimedir)/application
#>- $(INSTALL_DATA) x-kdevelop-project.kdelnk $(kde_mimedir)/application/
#>+ 1
- $(INSTALL_DATA) x-kdevelop-project.kdelnk $(DESTDIR)$(kde_mimedir)/application/
+ $(INSTALL_DATA) $(srcdir)/x-kdevelop-project.kdelnk $(DESTDIR)$(kde_mimedir)/application/
# remove ALL you have installed in install-data-local or install-exec-local
uninstall-local:
More information about the KDevelop
mailing list