Browse Source

Rename a few build variables for overall consistency

tags/r14.0.0
Timothy Pearson 7 years ago
parent
commit
14ad34cde3
34 changed files with 60 additions and 60 deletions
  1. +3
    -3
      CMakeLists.txt
  2. +1
    -1
      kcoloredit/Makefile.am
  3. +1
    -1
      kfax/Makefile.am
  4. +1
    -1
      kghostview/Makefile.am
  5. +1
    -1
      kiconedit/Makefile.am
  6. +1
    -1
      kooka/Makefile.am
  7. +1
    -1
      kpdf/Makefile.am
  8. +3
    -3
      kuickshow/src/kuickfile.h
  9. +1
    -1
      kview/modules/browser/Makefile.am
  10. +1
    -1
      kview/modules/effects/Makefile.am
  11. +1
    -1
      kview/modules/scale/Makefile.am
  12. +1
    -1
      kview/modules/scanner/Makefile.am
  13. +1
    -1
      kview/modules/template/Makefile.am
  14. +1
    -1
      kview/photobook/Makefile.am
  15. +2
    -2
      kviewshell/Makefile.am
  16. +1
    -1
      libkscan/Makefile.am
  17. +5
    -5
      tdefile-plugins/Makefile.am
  18. +2
    -2
      tdefile-plugins/bmp/tdefile_bmp.h
  19. +2
    -2
      tdefile-plugins/dds/tdefile_dds.h
  20. +2
    -2
      tdefile-plugins/dvi/tdefile_dvi.h
  21. +2
    -2
      tdefile-plugins/exr/tdefile_exr.h
  22. +2
    -2
      tdefile-plugins/gif/tdefile_gif.h
  23. +2
    -2
      tdefile-plugins/ico/tdefile_ico.h
  24. +2
    -2
      tdefile-plugins/jpeg/tdefile_jpeg.h
  25. +2
    -2
      tdefile-plugins/pcx/tdefile_pcx.h
  26. +2
    -2
      tdefile-plugins/pdf/tdefile_pdf.h
  27. +2
    -2
      tdefile-plugins/png/tdefile_png.h
  28. +2
    -2
      tdefile-plugins/pnm/tdefile_pnm.h
  29. +2
    -2
      tdefile-plugins/ps/tdefile_ps.h
  30. +2
    -2
      tdefile-plugins/rgb/tdefile_rgb.h
  31. +2
    -2
      tdefile-plugins/tga/tdefile_tga.h
  32. +2
    -2
      tdefile-plugins/tiff/tdefile_tiff.h
  33. +2
    -2
      tdefile-plugins/xbm/tdefile_xbm.h
  34. +2
    -2
      tdefile-plugins/xpm/tdefile_xpm.h

+ 3
- 3
CMakeLists.txt View File

@@ -77,7 +77,7 @@ option( BUILD_KCOLOREDIT "Build kcoloredit" ${BUILD_ALL} )
option( BUILD_KDVI "Build kdvi" ${BUILD_ALL} )
option( BUILD_KFAX "Build kfax" ${BUILD_ALL} )
option( BUILD_KFAXVIEW "Build kfaxview" ${BUILD_ALL} )
option( BUILD_KFILE_PLUGINS "Build tdefile-plugins" ${BUILD_ALL} )
option( BUILD_TDEFILE_PLUGINS "Build tdefile-plugins" ${BUILD_ALL} )
option( BUILD_KGAMMA "Build kgamma" ${BUILD_ALL} )
option( BUILD_KGHOSTVIEW "Build kghostview" ${BUILD_ALL} )
option( BUILD_KICONEDIT "Build kiconedit" ${BUILD_ALL} )
@@ -114,7 +114,7 @@ set( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined" )
##### tdegraphics directories ###################

# tdefile-plugins/ps requires dscparse-static library
if( BUILD_KFILE_PLUGINS AND NOT BUILD_KGHOSTVIEW )
if( BUILD_TDEFILE_PLUGINS AND NOT BUILD_KGHOSTVIEW )
add_subdirectory( kghostview/dscparse )
endif( )

@@ -124,7 +124,7 @@ tde_conditional_add_subdirectory( BUILD_KCOLOREDIT kcoloredit )
tde_conditional_add_subdirectory( BUILD_KDVI kdvi )
tde_conditional_add_subdirectory( BUILD_KFAX kfax )
tde_conditional_add_subdirectory( BUILD_KFAXVIEW kfaxview )
tde_conditional_add_subdirectory( BUILD_KFILE_PLUGINS tdefile-plugins )
tde_conditional_add_subdirectory( BUILD_TDEFILE_PLUGINS tdefile-plugins )
tde_conditional_add_subdirectory( BUILD_KGAMMA kgamma )
tde_conditional_add_subdirectory( BUILD_KGHOSTVIEW kghostview )
tde_conditional_add_subdirectory( BUILD_KICONEDIT kiconedit )


+ 1
- 1
kcoloredit/Makefile.am View File

@@ -6,7 +6,7 @@ kcoloredit_SOURCES = kzcolorselector.cpp imageselection.cpp \
editablestreamhistory.cpp color.cpp palette.cpp loadpalettedlg.cpp \
kcoloreditview.cpp kcoloreditdoc.cpp kcoloredit.cpp main.cpp
kcoloredit_METASOURCES = AUTO
kcoloredit_LDADD = $(LIB_TDEUI) $(LIB_KFILE)
kcoloredit_LDADD = $(LIB_TDEUI) $(LIB_TDEFILE)
kcoloredit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor

rcdir = $(kde_datadir)/kcoloredit


+ 1
- 1
kfax/Makefile.am View File

@@ -1,5 +1,5 @@
AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
LDADD = $(LIB_KFILE) $(LIB_TDEPRINT) -lm
LDADD = $(LIB_TDEFILE) $(LIB_TDEPRINT) -lm
INCLUDES = $(all_includes)

####### Files


+ 1
- 1
kghostview/Makefile.am View File

@@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = libkghostviewpart.la
noinst_LTLIBRARIES = libdscparse.la

libkghostviewlib_la_LDFLAGS = $(all_libraries)
libkghostviewlib_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -ltdeprint libdscparse.la
libkghostviewlib_la_LIBADD = $(LIB_TDEFILE) $(LIB_KPARTS) -ltdeprint libdscparse.la

libkghostviewpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
libkghostviewpart_la_LIBADD = libkghostviewlib.la


+ 1
- 1
kiconedit/Makefile.am View File

@@ -12,7 +12,7 @@ kiconedit_METASOURCES = AUTO

# the library search path.
kiconedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kiconedit_LDADD = $(LIB_KFILE) -ltdeprint
kiconedit_LDADD = $(LIB_TDEFILE) -ltdeprint

DISTCLEANFILES = *~ .deps/* .libs/*



+ 1
- 1
kooka/Makefile.am View File

@@ -16,7 +16,7 @@ kooka_SOURCES = main.cpp kooka.cpp kookaview.cpp kookapref.cpp \
kocrocrad.cpp
# pagesetup.cpp

kooka_LDADD = $(LIB_KFILE) -ltdeprint -ltdetexteditor $(LIBTIFF) $(top_builddir)/libkscan/libkscan.la $(KADMOS_LIB) $(LIB_KSPELL)
kooka_LDADD = $(LIB_TDEFILE) -ltdeprint -ltdetexteditor $(LIBTIFF) $(top_builddir)/libkscan/libkscan.la $(KADMOS_LIB) $(LIB_KSPELL)
kooka_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor

INCLUDES = -I$(top_srcdir)/libkscan $(all_includes) $(LIBSANE_INCLUDES) $(KADMOS_INC)


+ 1
- 1
kpdf/Makefile.am View File

@@ -19,7 +19,7 @@ libkpdfpart_la_SOURCES = dcop.skel error.cpp part.cpp
libkpdfpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
libkpdfpart_la_LIBADD = xpdf/xpdf/libxpdf.la conf/libkpdfconf.la \
core/libkpdfcore.la ui/libkpdfui.la $(LIB_KPARTS) \
$(LIB_KFILE) $(LIB_TDEPRINT) $(LIB_KUTILS) -lm
$(LIB_TDEFILE) $(LIB_TDEPRINT) $(LIB_KUTILS) -lm

partdesktopdir = $(kde_servicesdir)
partdesktop_DATA = kpdf_part.desktop


+ 3
- 3
kuickshow/src/kuickfile.h View File

@@ -7,8 +7,8 @@
**
****************************************************************************/

#ifndef KUICKFILE_H
#define KUICKFILE_H
#ifndef KUICTDEFILE_H
#define KUICTDEFILE_H

#include <tqobject.h>
#include <tqstring.h>
@@ -97,4 +97,4 @@ private:

bool operator==( const KuickFile& first, const KuickFile& second );

#endif // KUICKFILE_H
#endif // KUICTDEFILE_H

+ 1
- 1
kview/modules/browser/Makefile.am View File

@@ -3,7 +3,7 @@ INCLUDES = -I$(top_srcdir)/kview $(all_includes)
kde_module_LTLIBRARIES = kview_browserplugin.la

kview_browserplugin_la_SOURCES = kmyfileitemlist.cpp kviewbrowser.cpp
kview_browserplugin_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -ltdeprint
kview_browserplugin_la_LIBADD = $(LIB_TDEFILE) $(LIB_KPARTS) -ltdeprint
kview_browserplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)

plugdir = $(kde_datadir)/kviewviewer/kpartplugins


+ 1
- 1
kview/modules/effects/Makefile.am View File

@@ -3,7 +3,7 @@ INCLUDES = -I$(top_srcdir)/kview $(all_includes)
kde_module_LTLIBRARIES = kview_effectsplugin.la

kview_effectsplugin_la_SOURCES = kvieweffects.cpp
kview_effectsplugin_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -ltdeprint
kview_effectsplugin_la_LIBADD = $(LIB_TDEFILE) $(LIB_KPARTS) -ltdeprint
kview_effectsplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)

plugdir = $(kde_datadir)/kview/kpartplugins


+ 1
- 1
kview/modules/scale/Makefile.am View File

@@ -3,7 +3,7 @@ INCLUDES = -I$(top_srcdir)/kview $(all_includes)
kde_module_LTLIBRARIES = kview_scale.la

kview_scale_la_SOURCES = kfloatspinbox.cpp scaledlg.cpp kview_scale.cpp
kview_scale_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -ltdeprint
kview_scale_la_LIBADD = $(LIB_TDEFILE) $(LIB_KPARTS) -ltdeprint
kview_scale_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)

plugdir = $(kde_datadir)/kviewviewer/kpartplugins


+ 1
- 1
kview/modules/scanner/Makefile.am View File

@@ -3,7 +3,7 @@ INCLUDES = -I$(top_srcdir)/kview $(all_includes)
kde_module_LTLIBRARIES = kview_scannerplugin.la

kview_scannerplugin_la_SOURCES = kviewscanner.cpp
kview_scannerplugin_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -ltdeprint
kview_scannerplugin_la_LIBADD = $(LIB_TDEFILE) $(LIB_KPARTS) -ltdeprint
kview_scannerplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)

plugdir = $(kde_datadir)/kview/kpartplugins


+ 1
- 1
kview/modules/template/Makefile.am View File

@@ -3,7 +3,7 @@ INCLUDES = -I$(top_srcdir)/kview $(all_includes)
kde_module_LTLIBRARIES = kview_templateplugin.la

kview_templateplugin_la_SOURCES = kviewtemplate.cpp
kview_templateplugin_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -ltdeprint
kview_templateplugin_la_LIBADD = $(LIB_TDEFILE) $(LIB_KPARTS) -ltdeprint
kview_templateplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)

plugdir = $(kde_datadir)/kview/kpartplugins


+ 1
- 1
kview/photobook/Makefile.am View File

@@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = libphotobook.la
libphotobook_la_SOURCES = photobook.cpp

libphotobook_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
libphotobook_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS)
libphotobook_la_LIBADD = $(LIB_TDEFILE) $(LIB_KPARTS)

partrcdir = $(kde_servicesdir)
partrc_DATA = photobook.desktop


+ 2
- 2
kviewshell/Makefile.am View File

@@ -18,7 +18,7 @@ kviewerpart_la_SOURCES = kviewpart.cpp pageSizeWidget_base.ui \
optionDialogGUIWidget_base.ui optionDialogAccessibilityWidget.ui simplePageSize.cpp

kviewerpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
kviewerpart_la_LIBADD = ./libifaces.la $(LIB_KFILE) -ltdeparts
kviewerpart_la_LIBADD = ./libifaces.la $(LIB_TDEFILE) -ltdeparts

libtdemultipage_la_SOURCES = tdemultipage.cpp pageView.cpp marklist.cpp tdemultipageInterface.skel \
units.cpp pageSize.cpp simplePageSize.cpp renderedDocumentPage.cpp renderedDocumentPagePixmap.cpp \
@@ -30,7 +30,7 @@ libtdemultipage_la_SOURCES = tdemultipage.cpp pageView.cpp marklist.cpp tdemulti
kde_kcfg_DATA = kviewshell.kcfg

libtdemultipage_la_LDFLAGS = $(all_libraries)
libtdemultipage_la_LIBADD = $(LIB_KFILE) -ltdeprint -ltdeparts
libtdemultipage_la_LIBADD = $(LIB_TDEFILE) -ltdeprint -ltdeparts

emptymultipagepart_la_SOURCES = empty_multipage.cpp emptyRenderer.cpp
emptymultipagepart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module


+ 1
- 1
libkscan/Makefile.am View File

@@ -19,7 +19,7 @@ libkscan_la_SOURCES = kscandevice.cpp kscanslider.cpp kgammatable.cpp\


libkscan_la_LDFLAGS = $(all_libraries) $(LIBSANE_LDFLAGS) -no-undefined -version-info 1:0
libkscan_la_LIBADD = $(LIBSANE_LIBS) $(LIB_KFILE)
libkscan_la_LIBADD = $(LIBSANE_LIBS) $(LIB_TDEFILE)

kde_services_DATA = scanservice.desktop



+ 5
- 5
tdefile-plugins/Makefile.am View File

@@ -1,14 +1,14 @@
if include_EXR_MODULES
KFILE_EXR_SUBDIR=exr
TDEFILE_EXR_SUBDIR=exr
endif

if include_TIFF
KFILE_TIFF_SUBDIR=tiff
TDEFILE_TIFF_SUBDIR=tiff
endif

if include_PDF
KFILE_PDF_SUBDIR=pdf
TDEFILE_PDF_SUBDIR=pdf
endif

SUBDIRS=dependencies dvi png ps jpeg xbm xpm bmp tga rgb ico pcx $(KFILE_TIFF_SUBDIR) pnm \
$(KFILE_EXR_SUBDIR) $(KFILE_PDF_SUBDIR) dds gif raw
SUBDIRS=dependencies dvi png ps jpeg xbm xpm bmp tga rgb ico pcx $(TDEFILE_TIFF_SUBDIR) pnm \
$(TDEFILE_EXR_SUBDIR) $(TDEFILE_PDF_SUBDIR) dds gif raw

+ 2
- 2
tdefile-plugins/bmp/tdefile_bmp.h View File

@@ -17,8 +17,8 @@
*
*/

#ifndef __KFILE_BMP_H__
#define __KFILE_BMP_H__
#ifndef __TDEFILE_BMP_H__
#define __TDEFILE_BMP_H__

#include <tdefilemetainfo.h>



+ 2
- 2
tdefile-plugins/dds/tdefile_dds.h View File

@@ -17,8 +17,8 @@
*
*/

#ifndef __KFILE_DDS_H__
#define __KFILE_DDS_H__
#ifndef __TDEFILE_DDS_H__
#define __TDEFILE_DDS_H__

#include <tdefilemetainfo.h>



+ 2
- 2
tdefile-plugins/dvi/tdefile_dvi.h View File

@@ -18,8 +18,8 @@
*/


#ifndef __KFILE_DVI_H__
#define __KFILE_DVI_H__
#ifndef __TDEFILE_DVI_H__
#define __TDEFILE_DVI_H__

#include <tdefilemetainfo.h>



+ 2
- 2
tdefile-plugins/exr/tdefile_exr.h View File

@@ -18,8 +18,8 @@
* $Id$
*/

#ifndef __KFILE_EXR_H__
#define __KFILE_EXR_H__
#ifndef __TDEFILE_EXR_H__
#define __TDEFILE_EXR_H__

#include <tdefilemetainfo.h>
#include <kurl.h>


+ 2
- 2
tdefile-plugins/gif/tdefile_gif.h View File

@@ -16,8 +16,8 @@
*
*/

#ifndef __KFILE_GIF_H__
#define __KFILE_GIF_H__
#ifndef __TDEFILE_GIF_H__
#define __TDEFILE_GIF_H__

#include <tdefilemetainfo.h>
#include <kurl.h>


+ 2
- 2
tdefile-plugins/ico/tdefile_ico.h View File

@@ -17,8 +17,8 @@
*
*/

#ifndef __KFILE_ICO_H__
#define __KFILE_ICO_H__
#ifndef __TDEFILE_ICO_H__
#define __TDEFILE_ICO_H__

#include <tdefilemetainfo.h>



+ 2
- 2
tdefile-plugins/jpeg/tdefile_jpeg.h View File

@@ -17,8 +17,8 @@
*
*/

#ifndef __KFILE_JPEG_H__
#define __KFILE_JPEG_H__
#ifndef __TDEFILE_JPEG_H__
#define __TDEFILE_JPEG_H__

#include <tqdatetime.h>
#include <tdefilemetainfo.h>


+ 2
- 2
tdefile-plugins/pcx/tdefile_pcx.h View File

@@ -17,8 +17,8 @@
*
*/

#ifndef __KFILE_PCX_H_
#define __KFILE_PCX_H_
#ifndef __TDEFILE_PCX_H_
#define __TDEFILE_PCX_H_

#include <tdefilemetainfo.h>



+ 2
- 2
tdefile-plugins/pdf/tdefile_pdf.h View File

@@ -18,8 +18,8 @@
* $Id$
*/

#ifndef __KFILE_PDF_H__
#define __KFILE_PDF_H__
#ifndef __TDEFILE_PDF_H__
#define __TDEFILE_PDF_H__

#include <tdefilemetainfo.h>
#include <poppler-qt.h>


+ 2
- 2
tdefile-plugins/png/tdefile_png.h View File

@@ -18,8 +18,8 @@
* $Id$
*/

#ifndef __KFILE_PNG_H__
#define __KFILE_PNG_H__
#ifndef __TDEFILE_PNG_H__
#define __TDEFILE_PNG_H__

#include <tdefilemetainfo.h>
#include <kurl.h>


+ 2
- 2
tdefile-plugins/pnm/tdefile_pnm.h View File

@@ -17,8 +17,8 @@
*
*/

#ifndef __KFILE_PNM_H__
#define __KFILE_PNM_H__
#ifndef __TDEFILE_PNM_H__
#define __TDEFILE_PNM_H__

#include <tdefilemetainfo.h>



+ 2
- 2
tdefile-plugins/ps/tdefile_ps.h View File

@@ -18,8 +18,8 @@
* $Id$
*/

#ifndef __KFILE_PS_H__
#define __KFILE_PS_H__
#ifndef __TDEFILE_PS_H__
#define __TDEFILE_PS_H__

#include <tdefilemetainfo.h>



+ 2
- 2
tdefile-plugins/rgb/tdefile_rgb.h View File

@@ -17,8 +17,8 @@
*
*/

#ifndef __KFILE_RGB_H__
#define __KFILE_RGB_H__
#ifndef __TDEFILE_RGB_H__
#define __TDEFILE_RGB_H__

#include <tdefilemetainfo.h>



+ 2
- 2
tdefile-plugins/tga/tdefile_tga.h View File

@@ -17,8 +17,8 @@
*
*/

#ifndef __KFILE_TGA_H__
#define __KFILE_TGA_H__
#ifndef __TDEFILE_TGA_H__
#define __TDEFILE_TGA_H__

#include <tdefilemetainfo.h>



+ 2
- 2
tdefile-plugins/tiff/tdefile_tiff.h View File

@@ -17,8 +17,8 @@
*
*/

#ifndef __KFILE_TIFF_H_
#define __KFILE_TIFF_H_
#ifndef __TDEFILE_TIFF_H_
#define __TDEFILE_TIFF_H_

#include <tdefilemetainfo.h>



+ 2
- 2
tdefile-plugins/xbm/tdefile_xbm.h View File

@@ -17,8 +17,8 @@
*
*/

#ifndef __KFILE_XBM_H__
#define __KFILE_XBM_H__
#ifndef __TDEFILE_XBM_H__
#define __TDEFILE_XBM_H__

#include <tdefilemetainfo.h>



+ 2
- 2
tdefile-plugins/xpm/tdefile_xpm.h View File

@@ -21,8 +21,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/

#ifndef KFILE_XPM_H
#define KFILE_XPM_H
#ifndef TDEFILE_XPM_H
#define TDEFILE_XPM_H

/**
* Note: For further information look into <$TDEDIR/include/tdefilemetainfo.h>


Loading…
Cancel
Save