Commit 4ade1161 authored by Laurent Montel's avatar Laurent Montel 😁

Move lib into libs directory (make more sense and

cmake stored generated lib into "lib" directory)

svn path=/trunk/koffice/; revision=523188
parent dd86b7a8
......@@ -41,33 +41,33 @@ include_directories( ${CMAKE_SOURCE_DIR}/lib/kofficecore/ ${CMAKE_CURRENT_SOURCE
# TODO remove this (wrong order) once we have per-lib variables to use like in kdelibs.
include_directories( ${KDE4_INCLUDE_DIRS} )
add_subdirectory(lib)
#add_subdirectory(ascend)
add_subdirectory(autocorrect)
add_subdirectory(doc)
add_subdirectory(libs)
#add_subdirectory(example)
#add_subdirectory(filters)
add_subdirectory(interfaces)
#add_subdirectory(karbon)
#add_subdirectory(kchart)
add_subdirectory(kdgantt)
#add_subdirectory(kchart)
#add_subdirectory(kexi)
#add_subdirectory(kformula)
#add_subdirectory(kivio)
#add_subdirectory(koshell)
#add_subdirectory(kounavail)
add_subdirectory(kounavail)
#add_subdirectory(kplato)
#add_subdirectory(kpresenter)
#add_subdirectory(krita)
#add_subdirectory(kspread)
#add_subdirectory(kugar)
#add_subdirectory(kword)
#add_subdirectory(ascend)
add_subdirectory(mimetypes)
add_subdirectory(pics)
#add_subdirectory(plugins)
add_subdirectory(plugins)
add_subdirectory(servicetypes)
add_subdirectory(templates)
#add_subdirectory(tools)
add_subdirectory(tools)
add_subdirectory(filters)
add_subdirectory(autocorrect)
add_subdirectory(doc)
MESSAGE(STATUS "Perhaps not install FindKDE4. It will conflict when we install with rpm/deb package")
add_subdirectory( cmake )
......
Changes after KOffice-1.4 (other than those done in branch too)
=========================
- Made OpenDocument the default format in kword and kpresenter
- Removed support for saving in the koffice-1.1 format.
Changes after KOffice-1.4-beta1
===============================
KOfficeCore:
- Create backup file faster for local files
- OASIS: fix memleak during loading (styles dom elements)
- OASIS: correct handling of default styles (per-family)
Changes after KOffice-1.3
=========================
KOfficeUI:
- Fix overwriting of templates (#73537)
- Fix loading of icons when creating templates
- Allow template icons up to 64x64 instead of 60x60 and scale better if too big
KOfficeCore:
- Support MS-DOS EPS files directly without stripping them internally.
- Add new info in document properties (Subject/Keywords/home-work phone)
KoText:
- Add new variable (statistic, Subject/Keywords/home-work phone/Position)
Changes after KOffice-1.3-rc1
=============================
KOfficeCore:
- Fixed doc/window association which led to closing all windows when closing only one.
KoText:
- Fixed rare crash when applying a format to a selection
- Fixed painting bug in text view mode (the right side was being erased).
- Fixed saving of left-to-right direction in RTL paragraphs
KOSpell:
- Fixed bug where the dialog wouldn't show the spell client from the config file
Changes after KOffice-1.3-beta4
===============================
KOfficeCore:
- Restart autosave timer when saving
- Fixes for remote documents (authentication dialog not on top, error handling)
- Restore ability to detect documents without extension (was broken by KDE-3.2-alpha's KZip)
KOSpell:
- Many stability fixes
KoText:
- Fixed missed hit during search-replace backwards with a single paragraph
Changes after KOffice-1.3-beta3
===============================
KOfficeCore:
- Fixed saving of the window size when closing
- Cache the configuration object around kofficerc, to improve startup performance
KoText:
- Improve hierarchical numbering - doesn't require using a suffix of '.' anymore,
and doesn't copy over the prefix and suffix from parent levels anymore (#40911).
- PgUp/PgDown works better than before when "move the caret" is enabled (#45246)
- Fixed painting of non-breakable-spaces (could show up as a visible square)
- Implemented painting of non-breakable-spaces when "draw formatting characters" is on
- Fixed crash (e.g. happening with 'section title' variable, #61735)
- Fixed pasting of plain text (so that it creates new pages if necessary, #58651)
Changes after KOffice-1.3-beta2
===============================
- Support for EPS images: works again for gs interpreters without the png16m device
- KoText:
Paragraph borders now support variable width (e.g. being inside
DTP frames of different widths).
Changes after KOffice-1.3-beta1
===============================
- Support for opening backup files (e.g. foo.kwd~)
- Page Layout Dialog: validate user input to prevent nonsense (e.g. margins wider than page)
- KoText:
Fixed drawing of word-by-word underline and strikeout
Repainting fixes (in multiline paragraphs)
Linespacing fixes (at-least and multiple work as advertised, added "fixed")
Major reduction of the memory usage per paragraph
Hyphenation fixes (support for breaking the same words more than once)
Shadow is now a character property (instead of a paragraph property)
More precise painting of paragraph borders
Changes after KOffice-1.2
=======================
- New command line option: --print. Prints the document(s) passed on the command
line, without showing a window. Useful for scripts and servicemenus.
kde4_header()
include_directories(
${CMAKE_SOURCE_DIR}/lib/kofficeui/
${CMAKE_SOURCE_DIR}/lib/store/
${KDE4_INCLUDE_DIR}
${QT_INCLUDES} )
add_subdirectory( store )
add_subdirectory( kwmf )
add_subdirectory( kofficecore )
add_subdirectory( kofficeui )
add_subdirectory( koproperty )
add_subdirectory( kotext )
add_subdirectory( kformula )
add_subdirectory( kopalette )
message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}: skipped subdir $(KROSSDIR)")
message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}: skipped subdir $(KOPAINTERDIR)")
message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}: skipped subdir $(KROSSDIR)")
########### install files ###############
kde4_create_doxygen_docs( REFERENCES dcop kprint kdeui kparts )
kde4_footer()
#original Makefile.am contents follow:
#if compile_lib_KOPAINTER
#KOPAINTERDIR = kopainter
#endif
#
#if compile_kross
#KROSSDIR = kross
#endif
#
#if compile_kexionly
#SUBDIRS = store kwmf kofficecore kofficeui koproperty $(KROSSDIR)
#else
#SUBDIRS = store kwmf kofficecore kofficeui kotext \
# $(KOPAINTERDIR) kformula koproperty kopalette $(KROSSDIR)
#endif
#
#messages:
## $(MAKE) -C kformula -f Makefile.am symbolnames.cc
# EXCLUDE="-path ./koproperty"; \
# LIST=`find . \( \( $$EXCLUDE \) -prune -o -name \*.ui -o -name \*.rc \) -type f | grep -v -e '/\.'`; \
# $(EXTRACTRC) $$LIST > rc.cpp; \
# LIST=`find . \( \( $$EXCLUDE \) -prune -o -name \*.cpp -o -name \*.cc \) -type f | grep -v -e '/\.'`; \
# $(XGETTEXT) $$LIST -o $(podir)/koffice.pot
## $(EXTRACTRC) */*.rc */*.ui > rc.cpp
## $(XGETTEXT) kotext/kohyphen/*.cpp */*.cc */*.cpp -o $(podir)/koffice.pot
## rm -f kformula/symbolnames.cc
#
#DOXYGEN_REFERENCES = dcop kprint kdeui kparts
#include ../admin/Doxyfile.am
if compile_lib_KOPAINTER
KOPAINTERDIR = kopainter
endif
if compile_kross
KROSSDIR = kross
endif
if compile_kexionly
SUBDIRS = store kwmf kofficecore kofficeui koproperty $(KROSSDIR)
else
SUBDIRS = store kwmf kofficecore kofficeui kotext \
$(KOPAINTERDIR) kformula koproperty kopalette $(KROSSDIR)
endif
messages:
# $(MAKE) -C kformula -f Makefile.am symbolnames.cc
EXCLUDE="-path ./koproperty"; \
LIST=`find . \( \( $$EXCLUDE \) -prune -o -name \*.ui -o -name \*.rc \) -type f | grep -v -e '/\.'`; \
$(EXTRACTRC) $$LIST > rc.cpp; \
LIST=`find . \( \( $$EXCLUDE \) -prune -o -name \*.cpp -o -name \*.cc \) -type f | grep -v -e '/\.'`; \
$(XGETTEXT) $$LIST -o $(podir)/koffice.pot
# $(EXTRACTRC) */*.rc */*.ui > rc.cpp
# $(XGETTEXT) kotext/kohyphen/*.cpp */*.cc */*.cpp -o $(podir)/koffice.pot
# rm -f kformula/symbolnames.cc
DOXYGEN_REFERENCES = dcop kprint kdeui kparts
include ../admin/Doxyfile.am
Please use all-lowercase for new file names.
The current mixed casing used in kofficecore and kofficeui is too confusing
(koDocumentInfoDlg vs KoDocumentInfoDlg, the difference is hard to see),
inconsistent with the rest of KDE, and breaks the emacs shortcut for auto-inserting
#include statements.
Maybe one day we'll rename all the current mixed-case files...
AC_SUBST(KWMF_INCLUDES, '-I$(top_srcdir)/lib/kwmf -I$(top_builddir)/lib/kwmf')
AC_SUBST(KSTORE_INCLUDES, '-I$(top_srcdir)/lib/store -I$(top_builddir)/lib/store')
AC_SUBST(KOTEXT_INCLUDES, '-I$(top_srcdir)/lib/kotext -I$(top_builddir)/lib/kotext')
AC_SUBST(KOPAINTER_INCLUDES, '-I$(top_srcdir)/lib/kopainter -I$(top_builddir)/lib/kopainter')
AC_SUBST(KOPALETTE_INCLUDES, '-I$(top_srcdir)/lib/kopalette -I$(top_builddir)/lib/kopalette')
AC_SUBST(KOFFICECORE_INCLUDES, '-I$(top_srcdir)/lib/kofficecore -I$(top_builddir)/lib/kofficecore')
AC_SUBST(KOFFICEUI_INCLUDES, '-I$(top_srcdir)/lib/kofficeui -I$(top_builddir)/lib/kofficeui')
AC_SUBST(KFORMULA_INCLUDES, '-I$(top_srcdir)/lib/kformula -I$(top_builddir)/lib/kformula')
dnl those are included with e.g. <koproperty/set.h>
AC_SUBST(KOPROPERTY_INCLUDES, '-I$(top_srcdir)/lib -I$(top_builddir)/lib')
AC_SUBST(KROSS_INCLUDES, '-I$(top_srcdir)/lib/kross -I$(top_builddir)/lib/kross')
AC_SUBST(LIB_KOFFICEUI, '$(top_builddir)/lib/kofficeui/libkofficeui.la')
AC_SUBST(LIB_KOFFICECORE, '$(top_builddir)/lib/kofficecore/libkofficecore.la')
AC_SUBST(LIB_KSTORE, '$(top_builddir)/lib/store/libkstore.la')
AC_SUBST(LIB_KOTEXT, '$(top_builddir)/lib/kotext/libkotext.la')
AC_SUBST(LIB_KOPAINTER, '$(top_builddir)/lib/kopainter/libkopainter.la')
AC_SUBST(LIB_KOPALETTE, '$(top_builddir)/lib/kopalette/libkopalette.la')
AC_SUBST(LIB_KWMF, '$(top_builddir)/lib/kwmf/libkwmf.la')
AC_SUBST(LIB_KOWMF, '$(top_builddir)/lib/kwmf/libkowmf.la')
AC_SUBST(LIB_KFORMULA, '$(top_builddir)/lib/kformula/libkformulalib.la')
AC_SUBST(LIB_KOPROPERTY, '$(top_builddir)/lib/koproperty/libkoproperty.la')
AC_SUBST(LIB_KROSS_API, '$(top_builddir)/lib/kross/api/libkrossapi.la')
AC_SUBST(LIB_KROSS_MAIN, '$(top_builddir)/lib/kross/main/libkrossmain.la')
AC_SUBST(interfacedir, '$(top_srcdir)/lib/interfaces')
AC_SUBST(KOFFICE_LIBS, '$(LIB_KOFFICEUI) $(LIB_KOFFICECORE) $(LIB_KSTORE)')
AC_SUBST(KOFFICE_INCLUDES, '$(KOFFICEUI_INCLUDES) $(KOFFICECORE_INCLUDES) $(KSTORE_INCLUDES) $(KWMF_INCLUDES) $(KOPALETTE_INCLUDES)')
AC_DEFINE_UNQUOTED(PREFIX,"$prefix",[Define the PREFIX where to install this package])
if test -s $srcdir/inst-apps ; then
SUBDIRLIST=`cat $srcdir/inst-apps`
else
SUBDIRLIST=`cat $srcdir/subdirs`
fi
# fallback (KDE_CREATE_SUBDIRLIST has this fallback, so I have put it here too.)
if test -z "$SUBDIRLIST" ; then
SUBDIRLIST=`ls -1 $srcdir`
fi
AC_MSG_CHECKING([whether only Kexi is being built])
KEXI_ONLY=yes
for args in $SUBDIRLIST ; do
case $args in
lib) ;;
kexi) ;;
*) if test -d $srcdir/$args ; then
KEXI_ONLY=no
fi
;;
esac
done
AC_MSG_RESULT([$KEXI_ONLY])
AM_CONDITIONAL(compile_kexionly, test "$KEXI_ONLY" = "yes" )
AC_MSG_CHECKING([whether kopainter should be compiled])
# first check which main application we could compile
for args in $SUBDIRLIST ; do
case $args in
krita) COMPILE_LIB_FOR_KRITA="$args " ;;
karbon) COMPILE_LIB_FOR_KARBON="$args " ;;
kivio) COMPILE_LIB_FOR_KIVIO="$args " ;;
esac
done
# now remove the applications the user has asked not to compile
for args in $DO_NOT_COMPILE ; do
case $args in
krita) COMPILE_LIB_FOR_KRITA= ;;
karbon) COMPILE_LIB_FOR_KARBON= ;;
kivio) COMPILE_LIB_FOR_KIVIO= ;;
esac
done
if test -n "$COMPILE_LIB_FOR_KRITA$COMPILE_LIB_FOR_KARBON$COMPILE_LIB_FOR_KIVIO" ; then
USERFEEDBACKCOMPILELIB="yes"
else
USERFEEDBACKCOMPILELIB="no"
fi
AC_MSG_RESULT([$USERFEEDBACKCOMPILELIB])
AM_CONDITIONAL(compile_lib_KOPAINTER, test "$USERFEEDBACKCOMPILELIB" = "yes" )
# These are the rules used by makekdedoc to generate the kdelibs
# documentation with KDOC. Please update them if I forget any
# dependencies.
#
# -Taj (Apr 1999)