diff --git a/CMakeLists.txt b/CMakeLists.txt index 4ce92f9a9..be963c632 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -107,43 +107,3 @@ install( FILES part.rc DESTINATION ${DATA_INSTALL_DIR}/okularpart ) kde4_install_icons( ${ICON_INSTALL_DIR} hicolor ) - - - - -#original Makefile.am contents follow: - -#SUBDIRS = conf core ui shell generators -# -#INCLUDES = -Iconf $(all_includes) $(FREETYPE_CFLAGS) -# -#METASOURCES = AUTO -# -#messages: rc.cpp -# $(EXTRACTRC) `find . -name "*.rc" -o -name "*.ui"` >> rc.cpp -# $(XGETTEXT) `find . -name "*.cpp" -o -name "*.cc" -o -name "*.h"` -o $(podir)/okular.pot -# -#KDE_ICON = okular -# -########################################################################## -## KPART SECTION -########################################################################## -#kde_module_LTLIBRARIES = libokularpart.la -# -#libokularpart_la_SOURCES = dcop.skel part.cpp -#libokularpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -#libokularpart_la_LIBADD = conf/libokularconf.la core/libokularcore.la \ -# ui/libokularui.la ui/painter_agg2/libagg2.la $(LIB_KPARTS) \ -# $(LIB_KFILE) $(LIB_KDEPRINT) $(LIB_KUTILS) $(LIB_KNEWSTUFF) \ -# $(LIB_KHTML) -lm -# -#partdesktopdir = $(kde_servicesdir) -#partdesktop_DATA = okular_part.desktop -# -#partrcdir = $(kde_datadir)/okularpart -#partrc_DATA = part.rc -# -#part.lo: conf/settings.h -# -#include $(top_srcdir)/admin/Doxyfile.am -# diff --git a/conf/CMakeLists.txt b/conf/CMakeLists.txt index 4b6a03466..f72169fbf 100644 --- a/conf/CMakeLists.txt +++ b/conf/CMakeLists.txt @@ -1,17 +1,2 @@ install(FILES okular.kcfg DESTINATION ${KCFG_INSTALL_DIR}) -#original Makefile.am contents follow: - -#INCLUDES = -I$(srcdir)/.. -I$(top_builddir)/kpdf $(all_includes) -# -#METASOURCES = AUTO -# -#libokularconf_la_SOURCES = dlggeneral.ui dlgperformance.ui dlgaccessibility.ui \ -# dlgpresentation.ui \ -# preferencesdialog.cpp settings.kcfgc -# -#noinst_LTLIBRARIES = libokularconf.la -# -#kde_kcfg_DATA = okular.kcfg -# -#preferencesdialog.lo: settings.h diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index befd70cdf..c6dbd2027 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -1,21 +1,2 @@ install( FILES okularGenerator.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) -#original Makefile.am contents follow: - -#SUBDIRS = . -# -#INCLUDES = -I.. -I$(builddir)/../conf $(all_includes) -# -#METASOURCES = AUTO -# -#libokularcore_la_SOURCES = chooseenginedialog.ui generator.cpp area.cpp textpage.cpp page.cpp document.cpp link.cpp annotations.cpp \ -# pagetransition.cpp -#libokularcore_la_LIBADD = $(KDE_LDFLAGS) $(LIB_KIO) -# -#kde_servicetypes_DATA = \ -# okularGenerator.desktop -# -#noinst_LTLIBRARIES = libokularcore.la -# -#document.lo: ../conf/settings.h -#page.lo: ../conf/settings.h diff --git a/generators/CMakeLists.txt b/generators/CMakeLists.txt index 9b131e538..b71c6e211 100644 --- a/generators/CMakeLists.txt +++ b/generators/CMakeLists.txt @@ -19,19 +19,3 @@ if(TIFF_FOUND) add_subdirectory(tiff) endif(TIFF_FOUND) -#original Makefile.am contents follow: - -#if include_ghostscript -#GSPLUGINDIR = ghostview -#endif -# -#if include_chm -#CHMPLUGINDIR = chm -#endif -# -#if include_pdf -#PDFPLUGINDIR = poppler -#endif -# -#SUBDIRS = $(GSPLUGINDIR) poppler fax kimgio $(CHMPLUGINDIR) -# diff --git a/generators/chm/CMakeLists.txt b/generators/chm/CMakeLists.txt index 16e4bb514..e25ed211c 100644 --- a/generators/chm/CMakeLists.txt +++ b/generators/chm/CMakeLists.txt @@ -39,30 +39,3 @@ install(TARGETS okularGenerator_chmlib DESTINATION ${PLUGIN_INSTALL_DIR}) install( FILES libokularGenerator_chmlib.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) - - -#original Makefile.am contents follow: - -#SUBDIRS = lib . kio-msits -# -##bin_PROGRAMS = helper -##helper_SOURCES = helper.cpp -##helper_LDFLAGS = $(LIB_QT) -##helper_LDADD = $(top_builddir)/kpdf/core/libkpdfcore.la $(top_builddir)/kpdf/conf/libkpdfconf.la lib/libchmfile.la -# -#kde_module_LTLIBRARIES = \ -# libokularGenerator_chmlib.la -# -#INCLUDES = -I$(srcdir)/../.. -I../.. $(all_includes) -# -#libokularGenerator_chmlib_la_LIBADD = ../../core/libokularcore.la \ -# ../../conf/libokularconf.la \ -# lib/libchmfile.la \ -# $(LIB_KDEPRINT) $(LIB_KDEUI) $(LIB_KHTML) -lchm -#libokularGenerator_chmlib_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -#libokularGenerator_chmlib_la_SOURCES = generator_t.cpp -#METASOURCES = AUTO -#KDE_OPTIONS = nofinal -# -#kde_services_DATA = libokularGenerator_chmlib.desktop -# diff --git a/generators/chm/kio-msits/CMakeLists.txt b/generators/chm/kio-msits/CMakeLists.txt index 471e7e5c4..c18dceff4 100644 --- a/generators/chm/kio-msits/CMakeLists.txt +++ b/generators/chm/kio-msits/CMakeLists.txt @@ -23,19 +23,3 @@ install(TARGETS kio_msits DESTINATION ${PLUGIN_INSTALL_DIR} ) install( FILES msits.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) - -#original Makefile.am contents follow: - -#METASOURCES = AUTO -#INCLUDES = $(QT_INCLUDES) -I$(CHM_INCLUDES) $(KDE_INCLUDES) $(all_includes) -# -#kde_module_LTLIBRARIES = kio_msits.la -# -#kio_msits_la_SOURCES = msits.cpp -#kio_msits_la_LIBADD = $(LIB_KIO) -lchm -#kio_msits_la_LDFLAGS = -module -avoid-version $(QT_LIBS) $(KDE_LDFLAGS) $(KDE_LIBS) $(KDE_PLUGIN) -# -#protocol_DATA = msits.protocol -#protocoldir = $(kde_servicesdir) -# -# diff --git a/generators/fax/CMakeLists.txt b/generators/fax/CMakeLists.txt index 60255d5e6..6211cd56c 100644 --- a/generators/fax/CMakeLists.txt +++ b/generators/fax/CMakeLists.txt @@ -28,31 +28,3 @@ install( FILES libokularGenerator_fax.desktop DESTINATION ${SERVICES_INSTALL_D kde4_install_icons( ${ICON_INSTALL_DIR} hicolor ) - - - - -#original Makefile.am contents follow: - -#INCLUDES = -I$(srcdir)/../../ -I$(srcdir)/libkfaximage $(all_includes) -# -#SUBDIRS = libkfaximage . -# -#kde_module_LTLIBRARIES = \ -# libokularGenerator_fax.la -# -#libokularGenerator_fax_la_LIBADD = ../../core/libokularcore.la \ -# ../../conf/libokularconf.la $(LIB_KDEUI) \ -# libkfaximage/libkfaximage.la -# -#libokularGenerator_fax_la_LDFLAGS = -module -avoid-version $(KDE_PLUGIN) $(all_libraries) -#libokularGenerator_fax_la_SOURCES = faxrenderer.cpp -# -#METASOURCES = AUTO -# -#kde_services_DATA = libokularGenerator_fax.desktop -# -#KDE_ICON = kfaxview -# -#messages: rc.cpp -# $(XGETTEXT) *.cpp -o $(podir)/kfaxview.pot diff --git a/generators/fax/libkfaximage/CMakeLists.txt b/generators/fax/libkfaximage/CMakeLists.txt index 619827f3c..29f64a941 100644 --- a/generators/fax/libkfaximage/CMakeLists.txt +++ b/generators/fax/libkfaximage/CMakeLists.txt @@ -1,5 +1,4 @@ - ########### next target ############### set(kfaximage_LIB_SRCS kfaximage.cpp faxexpand.cpp faxinit.cpp ) @@ -18,21 +17,3 @@ install(TARGETS kfaximage DESTINATION ${LIB_INSTALL_DIR} ) install(FILES kfaximage.h DESTINATION ${INCLUDE_INSTALL_DIR}) - - -#original Makefile.am contents follow: - -#INCLUDES = -I$(top_srcdir) $(all_includes) -# -#lib_LTLIBRARIES = libkfaximage.la -#libkfaximage_la_LDFLAGS = $(all_libraries) -no-undefined -avoid-version -#libkfaximage_la_LIBADD = $(LIB_QTCORE) $(LIB_QT) $(LIB_KDECORE) -#libkfaximage_la_SOURCES = kfaximage.cpp faxexpand.cpp faxinit.cpp -# -#include_HEADERS = kfaximage.h -#noinst_HEADERS = faxexpand.h -# -#METASOURCES = AUTO -# -#messages: rc.cpp -# $(XGETTEXT) $(libkfaximage_la_SOURCES) -o $(podir)/libkfaximgage.pot diff --git a/generators/ghostview/CMakeLists.txt b/generators/ghostview/CMakeLists.txt index 900bb7f1c..c498908d1 100644 --- a/generators/ghostview/CMakeLists.txt +++ b/generators/ghostview/CMakeLists.txt @@ -56,32 +56,3 @@ install(TARGETS okularGenerator_ghostview DESTINATION ${PLUGIN_INSTALL_DIR}) install( FILES libokularGenerator_ghostview.desktop okularGhostview.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) - - -#original Makefile.am contents follow: - -#SUBDIRS = conf . -# -#INCLUDES = -I$(srcdir)/../.. -I$(top_builddir)/kpdf $(all_includes) -# -#METASOURCES = AUTO -#KDE_CXXFLAGS=-Wall -# -#bin_PROGRAMS = kpdflibgsasyncgenerator -#kpdflibgsasyncgenerator_SOURCES = kpdflibgsasyncgenerator.cpp -#kpdflibgsasyncgenerator_LDFLAGS = $(QT_LDFLAGS) $(all_libraries) -L$(LIB_GS_PATH) -#kpdflibgsasyncgenerator_LDADD = -lqgs $(LIB_QT) $(LIB_KDECORE) -#kde_module_LTLIBRARIES = libokularGenerator_ghostview.la -# -#libokularGenerator_ghostview_la_LIBADD = $(top_builddir)/kpdf/generators/ghostview/conf/libgssettings.la \ -# $(top_builddir)/kpdf/core/libokularcore.la $(top_builddir)/kpdf/conf/libokularconf.la -lqgs $(LIB_KDEUI) $(LIB_KDEPRINT) -#libokularGenerator_ghostview_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -L$(LIB_GS_PATH) -#libokularGenerator_ghostview_la_SOURCES = interpreter_cmd.cpp internaldocument.cpp generator_ghostview.cpp gvlogwindow.cpp dscparse_adapter.cpp ps.c dscparse.cpp -##libokularGenerator_ghostview_la_METASOURCES = AUTO -# -#KDE_OPTIONS = nofinal -# -# -#kde_services_DATA = libokularGenerator_ghostview.desktop -# -# diff --git a/generators/ghostview/conf/CMakeLists.txt b/generators/ghostview/conf/CMakeLists.txt index 7ebeb2cdd..63364e7fb 100644 --- a/generators/ghostview/conf/CMakeLists.txt +++ b/generators/ghostview/conf/CMakeLists.txt @@ -1,17 +1,3 @@ install(FILES gssettings.kcfg DESTINATION ${KCFG_INSTALL_DIR}) - -#original Makefile.am contents follow: - -#noinst_LTLIBRARIES = libgssettings.la -# -#INCLUDES = -I$(srcdir)/../.. -I$(top_builddir)/kpdf $(all_includes) -# -#libgssettings_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -#libgssettings_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIB_QT) -#libgssettings_la_SOURCES = empty.cpp gssettings.kcfgc gssettingswidget.ui -#kde_kcfg_DATA = gssettings.kcfg -# -#METASOURCES = AUTO -# diff --git a/generators/kimgio/CMakeLists.txt b/generators/kimgio/CMakeLists.txt index 77eb7e885..92244daf9 100644 --- a/generators/kimgio/CMakeLists.txt +++ b/generators/kimgio/CMakeLists.txt @@ -22,20 +22,3 @@ install(TARGETS okularGenerator_kimgio DESTINATION ${PLUGIN_INSTALL_DIR}) install( FILES libokularGenerator_kimgio.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) - - -#original Makefile.am contents follow: - -#kde_module_LTLIBRARIES = \ -# libokularGenerator_kimgio.la -# -#INCLUDES = -I$(srcdir)/../.. -I../../ $(all_includes) -# -#libokularGenerator_kimgio_la_LIBADD = ../../core/libokularcore.la \ -# ../../conf/libokularconf.la $(LIB_KDEUI) -#libokularGenerator_kimgio_la_LDFLAGS = -module -avoid-version $(KDE_PLUGIN) $(all_libraries) -#libokularGenerator_kimgio_la_SOURCES = generator_kimgio.cpp -# -#METASOURCES = AUTO -# -#kde_services_DATA = libokularGenerator_kimgio.desktop diff --git a/shell/CMakeLists.txt b/shell/CMakeLists.txt index 84288fa15..aff6ad17c 100644 --- a/shell/CMakeLists.txt +++ b/shell/CMakeLists.txt @@ -17,21 +17,3 @@ install( FILES okular.desktop DESTINATION ${XDG_APPS_DIR} ) install( FILES shell.rc DESTINATION ${DATA_INSTALL_DIR}/okular ) - -#original Makefile.am contents follow: - -#INCLUDES = -I$(top_builddir)/kpdf $(all_includes) -# -#METASOURCES = AUTO -# -#bin_PROGRAMS = okular -# -#okular_SOURCES = main.cpp shell.cpp -#okular_LDFLAGS = $(KDE_RPATH) $(all_libraries) -#okular_LDADD = $(LIB_KPARTS) -# -#EXTRA_DIST = okular.desktop -#xdg_apps_DATA = okular.desktop -# -#shellrcdir = $(kde_datadir)/okular -#shellrc_DATA = shell.rc diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt index 93fcf9297..b80c447b7 100644 --- a/ui/CMakeLists.txt +++ b/ui/CMakeLists.txt @@ -1,22 +1,2 @@ add_subdirectory( data ) -#original Makefile.am contents follow: - -#SUBDIRS = data painter_agg2 . -# -#INCLUDES = -I$(srcdir)/.. -I$(srcdir)/painter_agg2 -I.. $(all_includes) -# -#METASOURCES = AUTO -# -#noinst_LTLIBRARIES = libokularui.la -#libokularui_la_SOURCES = pagepainter.cpp pageview.cpp pageviewutils.cpp \ -# pageviewannotator.cpp minibar.cpp thumbnaillist.cpp \ -# searchwidget.cpp toc.cpp propertiesdialog.cpp \ -# presentationwidget.cpp side_reviews.cpp newstuff.cpp -# -#pageview.lo: ../conf/settings.h -#pageviewutils.lo: ../conf/settings.h -#presentationwidget.lo: ../conf/settings.h -#searchwidget.lo: ../conf/settings.h -#thumbnaillist.lo: ../conf/settings.h -# diff --git a/ui/data/CMakeLists.txt b/ui/data/CMakeLists.txt index e87ee7339..e7c2c8c0a 100644 --- a/ui/data/CMakeLists.txt +++ b/ui/data/CMakeLists.txt @@ -37,24 +37,3 @@ install(FILES ghns_star_gray.png DESTINATION ${DATA_INSTALL_DIR}/okular/pics) -#original Makefile.am contents follow: - -## install annotation tool images -#toolpicsdir = $(kde_datadir)/okular/pics -#toolpics_DATA = tool_eraser.png tool_hl_orange.png tool_hl_pink.png \ -# tool_hl_yellow.png tool_ink_green.png tool_note.png -# -## install annotation page images -#annpicsdir = $(kde_datadir)/okular/pics -#annpics_DATA = checkmark.png circle.png comment.png cross.png help.png \ -# insert.png key.png newparagraph.png note.png paragraph.png \ -# rightarrow.png rightpointer.png star.png uparrow.png \ -# upleftarrow.png -# -## install misc images -#miscpicsdir = $(kde_datadir)/okular/pics -#miscpics_DATA = ghns.png ghns_star.png ghns_star_gray.png -# -## install annotator xml tools description -#xmldir = $(kde_datadir)/okular -#xml_DATA = tools.xml