Commit b97d1dc2 authored by Laurent Montel's avatar Laurent Montel

Port++

Clean up

svn path=/trunk/extragear/graphics/digikam/; revision=676213
parent 1ca9e1ac
......@@ -27,7 +27,7 @@ INCLUDE_DIRECTORIES(${KEXIV2_INCLUDE_DIR}
ADD_SUBDIRECTORY( data )
ADD_SUBDIRECTORY( sqlite )
ADD_SUBDIRECTORY( libs )
#ADD_SUBDIRECTORY( utilities )
ADD_SUBDIRECTORY( utilities )
#ADD_SUBDIRECTORY( digikam )
#ADD_SUBDIRECTORY( showfoto )
#ADD_SUBDIRECTORY( kioslave )
......@@ -36,25 +36,6 @@ ADD_SUBDIRECTORY( libs )
install( FILES tips DESTINATION ${DATA_INSTALL_DIR}/digikam )
#kde4_create_doxygen_docs( )
#original Makefile.am contents follow:
#COMPILE_FIRST = sqlite
#
#SUBDIRS = sqlite libs utilities digikam showfoto data kioslave imageplugins themedesigner
#
#EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL README TODO digikam.lsm
#
#AUTOMAKE_OPTIONS = foreign
#
#MAINTAINERCLEANFILES = subdirs configure.in acinclude.m4 configure.files
#
#
#tip_DATA = tips
#tipdir = $(kde_datadir)/digikam
#
#messages: rc.cpp
# $(EXTRACTRC) `find . -name "*.ui"` >> rc.cpp
......@@ -66,20 +47,3 @@ install( FILES tips DESTINATION ${DATA_INSTALL_DIR}/digikam )
# fi
# rm -f tips.cpp
#
#include ../admin/Doxyfile.am
#
#fastcompile:
# for i in libs utilities digikam kioslave; \
# do \
# cd $$i; \
# make || exit 1; \
# cd ..; \
# done
#
#fastinstall:
# for i in libs utilities digikam kioslave; \
# do \
# cd $$i; \
# make install || exit 1; \
# cd ..; \
# done
#! /bin/sh
$PREPARETIPS > tips.cpp
$EXTRACTRC `find . -name \*.rc` >> rc.cpp || exit 11
$EXTRACTRC `find . -name \*.ui` >> rc.cpp || exit 11
$XGETTEXT `find . -name \*.h -o -name \*.hh -o -name \*.H -o -name \*.hxx -o -name \*.hpp -o -name \*.cpp -o -name \*.cc -o -name \*.cxx -o -name \*.ecpp -o -name \*.C` -o $podir/digikam.pot
rm -f tips.cpp
include_directories( ${CMAKE_SOURCE_DIR}/digikam/libs/histogram ${CMAKE_SOURCE_DIR}/digikam/libs/levels ${CMAKE_SOURCE_DIR}/digikam/libs/curves ${CMAKE_SOURCE_DIR}/digikam/libs/themeengine ${CMAKE_SOURCE_DIR}/digikam/libs/widgets/common ${CMAKE_SOURCE_DIR}/digikam/libs/thumbbar ${CMAKE_SOURCE_DIR}/digikam/libs/jpegutils ${CMAKE_SOURCE_DIR}/digikam/libs/dcraw ${CMAKE_SOURCE_DIR}/digikam/libs/dimg ${CMAKE_SOURCE_DIR}/digikam/libs/dmetadata ${CMAKE_SOURCE_DIR}/digikam/libs/imageproperties ${CMAKE_SOURCE_DIR}/digikam/libs/threadimageio ${CMAKE_SOURCE_DIR}/digikam/libs/database ${CMAKE_SOURCE_DIR}/digikam/libs/dialogs ${CMAKE_SOURCE_DIR}/digikam/utilities/cameragui ${CMAKE_SOURCE_DIR}/digikam/utilities/imageeditor/editor ${CMAKE_SOURCE_DIR}/digikam/utilities/imageeditor/canvas ${CMAKE_SOURCE_DIR}/digikam/utilities/splashscreen ${CMAKE_SOURCE_DIR}/digikam/utilities/setup ${CMAKE_SOURCE_DIR}/digikam/utilities/slideshow ${CMAKE_SOURCE_DIR}/digikam/utilities/batch ${CMAKE_SOURCE_DIR}/digikam/utilities/lighttable ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
include_directories( ${CMAKE_SOURCE_DIR}/digikam/libs/histogram ${CMAKE_SOURCE_DIR}/digikam/libs/levels ${CMAKE_SOURCE_DIR}/digikam/libs/curves ${CMAKE_SOURCE_DIR}/digikam/libs/themeengine ${CMAKE_SOURCE_DIR}/digikam/libs/widgets/common ${CMAKE_SOURCE_DIR}/digikam/libs/thumbbar ${CMAKE_SOURCE_DIR}/digikam/libs/jpegutils ${CMAKE_SOURCE_DIR}/digikam/libs/dcraw ${CMAKE_SOURCE_DIR}/digikam/libs/dimg ${CMAKE_SOURCE_DIR}/digikam/libs/dmetadata ${CMAKE_SOURCE_DIR}/digikam/libs/imageproperties ${CMAKE_SOURCE_DIR}/digikam/libs/threadimageio ${CMAKE_SOURCE_DIR}/digikam/libs/database ${CMAKE_SOURCE_DIR}/digikam/libs/dialogs ${CMAKE_SOURCE_DIR}/digikam/utilities/cameragui ${CMAKE_SOURCE_DIR}/digikam/utilities/imageeditor/editor ${CMAKE_SOURCE_DIR}/digikam/utilities/imageeditor/canvas ${CMAKE_SOURCE_DIR}/digikam/utilities/splashscreen ${CMAKE_SOURCE_DIR}/digikam/utilities/setup ${CMAKE_SOURCE_DIR}/digikam/utilities/slideshow ${CMAKE_SOURCE_DIR}/digikam/utilities/batch ${CMAKE_SOURCE_DIR}/digikam/utilities/lighttable )
########### next target ###############
......
......@@ -10,7 +10,7 @@ kde4_automoc(${kio_digikamthumbnail_PART_SRCS})
kde4_add_plugin(kio_digikamthumbnail ${kio_digikamthumbnail_PART_SRCS})
target_link_libraries(kio_digikamthumbnail ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} jpegutils dimg )
target_link_libraries(kio_digikamthumbnail ${KDE4_KIO_LIBS} jpegutils dimg )
install(TARGETS kio_digikamthumbnail DESTINATION ${PLUGIN_INSTALL_DIR} )
......@@ -23,7 +23,7 @@ kde4_automoc(${kio_digikamtags_PART_SRCS})
kde4_add_plugin(kio_digikamtags ${kio_digikamtags_PART_SRCS})
target_link_libraries(kio_digikamtags ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} database sqlite dimg )
target_link_libraries(kio_digikamtags ${KDE4_KIO_LIBS} database sqlite dimg )
install(TARGETS kio_digikamtags DESTINATION ${PLUGIN_INSTALL_DIR} )
......@@ -36,7 +36,7 @@ kde4_automoc(${kio_digikamalbums_PART_SRCS})
kde4_add_plugin(kio_digikamalbums ${kio_digikamalbums_PART_SRCS})
target_link_libraries(kio_digikamalbums ${KDE4_KDECORE_LIBS} jpegutils ${KDE4_KIO_LIBS} dimg database sqlite )
target_link_libraries(kio_digikamalbums jpegutils ${KDE4_KIO_LIBS} dimg database sqlite )
install(TARGETS kio_digikamalbums DESTINATION ${PLUGIN_INSTALL_DIR} )
......@@ -49,7 +49,7 @@ kde4_automoc(${kio_digikamdates_PART_SRCS})
kde4_add_plugin(kio_digikamdates ${kio_digikamdates_PART_SRCS})
target_link_libraries(kio_digikamdates ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} database sqlite dimg )
target_link_libraries(kio_digikamdates ${KDE4_KIO_LIBS} database sqlite dimg )
install(TARGETS kio_digikamdates DESTINATION ${PLUGIN_INSTALL_DIR} )
......@@ -62,7 +62,7 @@ kde4_automoc(${kio_digikamsearch_PART_SRCS})
kde4_add_plugin(kio_digikamsearch ${kio_digikamsearch_PART_SRCS})
target_link_libraries(kio_digikamsearch ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} database sqlite dimg )
target_link_libraries(kio_digikamsearch ${KDE4_KIO_LIBS} database sqlite dimg )
install(TARGETS kio_digikamsearch DESTINATION ${PLUGIN_INSTALL_DIR} )
......@@ -71,84 +71,3 @@ install(TARGETS kio_digikamsearch DESTINATION ${PLUGIN_INSTALL_DIR} )
install( FILES digikamthumbnail.protocol digikamtags.protocol digikamalbums.protocol digikamdates.protocol digikamsearch.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
#original Makefile.am contents follow:
#METASOURCES = AUTO
#
#INCLUDES = -I$(top_srcdir)/digikam/libs/jpegutils \
# -I$(top_srcdir)/digikam/libs/dimg \
# -I$(top_srcdir)/digikam/libs/dmetadata \
# -I$(top_srcdir)/digikam/libs/database \
# -I$(top_srcdir)/digikam/digikam \
# $(LIBKEXIV2_CFLAGS) $(LIBKDCRAW_CFLAGS) \
# $(all_includes)
#
#kde_module_LTLIBRARIES = kio_digikamthumbnail.la kio_digikamtags.la \
# kio_digikamalbums.la kio_digikamdates.la \
# kio_digikamsearch.la
#
#protocol_DATA = digikamthumbnail.protocol digikamtags.protocol \
# digikamalbums.protocol digikamdates.protocol \
# digikamsearch.protocol
#
#protocoldir = $(kde_servicesdir)
#
## -- digikam KIO image thumbnails generator ----------------------------------------
#
#kio_digikamthumbnail_la_SOURCES = digikamthumbnail.cpp
#
#kio_digikamthumbnail_la_LIBADD = $(LIB_KIO) $(LIBJPEG) $(LIBPNG) \
# $(top_builddir)/digikam/libs/jpegutils/libjpegutils.la \
# $(top_builddir)/digikam/libs/dimg/libdimg.la
#
#kio_digikamthumbnail_la_LDFLAGS = -module -avoid-version $(KDE_PLUGIN) $(all_libraries)
#
## -- digikam tags KIO --------------------------------------------------------------
#
#kio_digikamtags_la_SOURCES = digikamtags.cpp sqlitedb.cpp
#
#kio_digikamtags_la_LIBADD = $(LIB_KIO) $(LIB_SQLITE3) \
# $(LIBKEXIV2_LIBS) $(LIBKDCRAW_LIBS) \
# $(top_builddir)/digikam/libs/database/libdatabase.la \
# $(top_builddir)/digikam/sqlite/libsqlite.la \
# $(top_builddir)/digikam/libs/dimg/libdimg.la
#
#kio_digikamtags_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN)
#
## -- digikam albums KIO ------------------------------------------------------------
#
#kio_digikamalbums_la_SOURCES = digikamalbums.cpp sqlitedb.cpp
#
#kio_digikamalbums_la_LIBADD = $(top_builddir)/digikam/libs/jpegutils/libjpegutils.la \
# $(LIB_KIO) $(LIB_SQLITE3) \
# $(top_builddir)/digikam/libs/dimg/libdimg.la \
# $(top_builddir)/digikam/libs/database/libdatabase.la \
# $(top_builddir)/digikam/sqlite/libsqlite.la
#
#kio_digikamalbums_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN)
#
## -- digikam dates KIO -------------------------------------------------------------
#
#kio_digikamdates_la_SOURCES = digikamdates.cpp sqlitedb.cpp
#
#kio_digikamdates_la_LIBADD = $(LIB_KIO) $(LIB_SQLITE3)\
# $(LIBKEXIV2_LIBS) $(LIBKDCRAW_LIBS) \
# $(top_builddir)/digikam/libs/database/libdatabase.la \
# $(top_builddir)/digikam/sqlite/libsqlite.la \
# $(top_builddir)/digikam/libs/dimg/libdimg.la
#
#kio_digikamdates_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN)
#
## -- digikam search KIO ------------------------------------------------------------
#
#kio_digikamsearch_la_SOURCES = digikamsearch.cpp sqlitedb.cpp
#
#kio_digikamsearch_la_LIBADD = $(LIB_KIO) $(LIB_SQLITE3)\
# $(LIBKEXIV2_LIBS) $(LIBKDCRAW_LIBS) \
# $(top_builddir)/digikam/libs/database/libdatabase.la \
# $(top_builddir)/digikam/sqlite/libsqlite.la \
# $(top_builddir)/digikam/libs/dimg/libdimg.la
#
#kio_digikamsearch_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN)
......@@ -16,6 +16,6 @@ add_subdirectory( greycstoration )
#add_subdirectory( thumbbar )
#add_subdirectory( threadimageio )
#add_subdirectory( widgets )
#add_subdirectory( imageproperties )
add_subdirectory( imageproperties )
add_subdirectory( dialogs )
#add_subdirectory( database )
include_directories( ${CMAKE_SOURCE_DIR}/digikam/libs/histogram ${CMAKE_SOURCE_DIR}/digikam/libs/dcraw ${CMAKE_SOURCE_DIR}/digikam/libs/themeengine ${CMAKE_SOURCE_DIR}/digikam/libs/dmetadata ${CMAKE_SOURCE_DIR}/digikam/libs/widgets/common ${CMAKE_SOURCE_DIR}/digikam/libs/widgets/iccprofiles ${CMAKE_SOURCE_DIR}/digikam/libs/widgets/metadata ${CMAKE_SOURCE_DIR}/digikam/libs/dialogs ${CMAKE_SOURCE_DIR}/digikam/libs/dimg ${CMAKE_SOURCE_DIR}/digikam/libs/threadimageio ${CMAKE_SOURCE_DIR}/digikam/libs/database ${CMAKE_SOURCE_DIR}/digikam/utilities/cameragui ${CMAKE_SOURCE_DIR}/digikam/utilities/batch ${CMAKE_SOURCE_DIR}/digikam/digikam ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
include_directories( ${CMAKE_SOURCE_DIR}/digikam/libs/histogram ${CMAKE_SOURCE_DIR}/digikam/libs/dcraw ${CMAKE_SOURCE_DIR}/digikam/libs/themeengine ${CMAKE_SOURCE_DIR}/digikam/libs/dmetadata ${CMAKE_SOURCE_DIR}/digikam/libs/widgets/common ${CMAKE_SOURCE_DIR}/digikam/libs/widgets/iccprofiles ${CMAKE_SOURCE_DIR}/digikam/libs/widgets/metadata ${CMAKE_SOURCE_DIR}/digikam/libs/dialogs ${CMAKE_SOURCE_DIR}/digikam/libs/dimg ${CMAKE_SOURCE_DIR}/digikam/libs/threadimageio ${CMAKE_SOURCE_DIR}/digikam/libs/database ${CMAKE_SOURCE_DIR}/digikam/utilities/cameragui ${CMAKE_SOURCE_DIR}/digikam/utilities/batch ${CMAKE_SOURCE_DIR}/digikam/digikam )
########### next target ###############
set(libimagepropertiescamgui_STAT_SRCS imagepropertiessidebarcamgui.cpp cameraitempropertiestab.cpp)
KDE4_AUTOMOC(${libimagepropertiescamgui_STAT_SRCS})
KDE4_ADD_LIBRARY(libimagepropertiescamgui ${libimagepropertiescamgui_STAT_SRCS})
set(libimagepropertiesshowfoto_STAT_SRCS imagepropertiessidebar.cpp navigatebarwidget.cpp imagepropertiesmetadatatab.cpp imagepropertiescolorstab.cpp imagepropertiestab.cpp navigatebartab.cpp)
KDE4_AUTOMOC(${libimagepropertiesshowfoto_STAT_SRCS})
KDE4_ADD_LIBRARY(libimagepropertiesshowfoto ${libimagepropertiesshowfoto_STAT_SRCS})
########### next target ###############
set(libimagepropertiesdigikam_STAT_SRCS imagedescedittab.cpp imagepropertiessidebar.cpp imagepropertiessidebardb.cpp talbumlistview.cpp imagepropertiesmetadatatab.cpp talbumlistview.cpp imagepropertiesmetadatatab.cpp imagepropertiescolorstab.cpp navigatebarwidget.cpp imagepropertiestab.cpp navigatebartab.cpp)
KDE4_AUTOMOC(${libimagepropertiesdigikam_STAT_SRCS})
KDE4_ADD_LIBRARY(libimagepropertiesdigikam_STAT_SRCS ${libimagepropertiesdigikam_STAT_SRCS})
########### next target ###############
########### install files ###############
#original Makefile.am contents follow:
#METASOURCES = AUTO
#
#noinst_LTLIBRARIES = libimagepropertiesshowfoto.la libimagepropertiesdigikam.la \
# libimagepropertiescamgui.la
#
## Image Properties SideBar for Camera GUI.
#
#libimagepropertiescamgui_la_SOURCES = imagepropertiessidebarcamgui.cpp cameraitempropertiestab.cpp
#
#libimagepropertiescamgui_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
#
## Image Properties SideBar for Showfoto (without digiKam database support).
#
#libimagepropertiesshowfoto_la_SOURCES = imagepropertiessidebar.cpp navigatebarwidget.cpp \
# imagepropertiesmetadatatab.cpp imagepropertiescolorstab.cpp \
# imagepropertiestab.cpp navigatebartab.cpp
#
#libimagepropertiesshowfoto_la_LIBADD = $(top_builddir)/digikam/libs/widgets/libwidgets.la \
# $(top_builddir)/digikam/libs/dmetadata/libdmetadata.la \
# $(top_builddir)/digikam/libs/dimg/libdimg.la \
# $(top_builddir)/digikam/libs/threadimageio/libthreadimageio.la \
# $(top_builddir)/digikam/libs/histogram/libhistogram.la
#
#libimagepropertiesshowfoto_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
#
## Image Properties SideBar for digiKam Main interface and Image Editor (digiKam database support).
#
#libimagepropertiesdigikam_la_SOURCES = imagedescedittab.cpp imagepropertiessidebar.cpp \
# imagepropertiessidebardb.cpp \
# talbumlistview.cpp imagepropertiesmetadatatab.cpp \
# imagepropertiescolorstab.cpp \
# navigatebarwidget.cpp imagepropertiestab.cpp navigatebartab.cpp
#
#libimagepropertiesdigikam_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
#
#INCLUDES = -I$(top_srcdir)/digikam/libs/histogram \
# -I$(top_srcdir)/digikam/libs/dcraw \
# -I$(top_srcdir)/digikam/libs/themeengine \
# -I$(top_srcdir)/digikam/libs/dmetadata \
# -I$(top_srcdir)/digikam/libs/widgets/common \
# -I$(top_srcdir)/digikam/libs/widgets/iccprofiles \
# -I$(top_srcdir)/digikam/libs/widgets/metadata \
# -I$(top_srcdir)/digikam/libs/dialogs \
# -I$(top_srcdir)/digikam/libs/dimg \
# -I$(top_srcdir)/digikam/libs/threadimageio \
# -I$(top_srcdir)/digikam/libs/database \
# -I$(top_srcdir)/digikam/utilities/cameragui \
# -I$(top_srcdir)/digikam/utilities/batch \
# -I$(top_srcdir)/digikam/digikam \
# $(LIBKEXIV2_CFLAGS) $(LIBKDCRAW_CFLAGS) \
# $(all_includes)
#
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment