Fix compilation of DVI plugin

svn path=/trunk/KDE/kdegraphics/kviewshell/plugins/dvi/; revision=469963

Makefile.am

@@ -1,12 +1,10 @@
 # set the include path for X, qt and KDE
-INCLUDES= -I$(top_srcdir)/kviewshell \
-	-I$(top_builddir)/kviewshell \
+INCLUDES= -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/kviewshell/shell \
+	-I$(top_builddir)/kviewshell/shell \
 	$(all_includes) $(LIBFREETYPE_CFLAGS)
 # claim, which subdirectories you want to install
 SUBDIRS = . pix
 
-bin_PROGRAMS = kdvi
-
 # you can add here more. This one gets installed
 kde_module_LTLIBRARIES= kdvipart.la
 noinst_PROGRAMS = squeeze
@@ -31,17 +29,13 @@ kde_kcfg_DATA = kdvi.kcfg
 
 kdvipart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
 kdvipart_la_LIBADD = $(LIBFREETYPE_LIBS) -lkparts \
-			$(top_builddir)/kviewshell/libkmultipage.la
+			$(top_builddir)/kviewshell/shell/libkmultipage.la
 
 # Which sources should be compiled for squeeze.
 squeeze_SOURCES	= squeeze.c
 
 KDE_OPTIONS = nofinal
 
-kdvi_SOURCES = main.cpp 
-kdvi_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-kdvi_LDADD = ../kviewshell/libifaces.la ../kviewshell/libkviewshell.la -lkparts -lkde3support
-
 ## this option you can leave out. Just, if you use "make dist", you need it
 noinst_HEADERS = dvi.h dviRenderer.h xdvi.h
 
@@ -50,13 +44,11 @@ messages: rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/kdvi.pot
 	rm -f tips.cpp
 
-xdg_apps_DATA = kdvi.desktop
-
 tip_DATA = tips
 tipdir = $(kde_datadir)/kdvi
 
-partdir = $(kde_datadir)/kdvi
-part_DATA = ../kviewshell/kviewshell.rc kdvi_part.rc
+plugindir = $(kde_datadir)
+plugin_DATA = kdvi_part.rc
 
 kde_services_DATA = kdvimultipage.desktop
 

TeXFontDefinition.cpp

@@ -4,7 +4,7 @@
 #include <klocale.h>
 #include <qfile.h>
 
-#include "../config.h"
+#include "config.h"
 #include "dviRenderer.h"
 #include "fontpool.h"
 #include "kdvi.h"

TeXFontDefinition.h

@@ -15,7 +15,7 @@
 #ifndef _FONT_H
 #define _FONT_H
 
-#include <../config.h>
+#include "config.h"
 
 #include <Q3IntDict>
 #include <QString>

TeXFont_PFB.h

@@ -9,7 +9,7 @@
 // This file is compiled only if the FreeType library is present on
 // the system
 
-#include <../config.h>
+#include "config.h"
 #ifdef HAVE_FREETYPE
 
 #ifndef _TEXFONT_PFB_H

dviFile.cpp

@@ -62,7 +62,7 @@ extern "C" {
 #include "dvi.h"
 }
 
-#include "../kviewshell/pageSize.h"
+#include "pageSize.h"
 #include "dviFile.h"
 #include "fontpool.h"
 #include "xdvi.h"

fontEncoding.cpp

@@ -5,7 +5,7 @@
 // (C) 2003 Stefan Kebekus
 // Distributed under the GPL
 
-#include <../config.h>
+#include "config.h"
 #ifdef HAVE_FREETYPE
 
 #include <kdebug.h>

fontEncoding.h

@@ -6,7 +6,7 @@
 // (C) 2003 Stefan Kebekus
 // Distributed under the GPL
 
-#include <../config.h>
+#include "config.h"
 #ifdef HAVE_FREETYPE
 
 

fontEncodingPool.cpp

@@ -5,7 +5,7 @@
 // (C) 2003 Stefan Kebekus
 // Distributed under the GPL
 
-#include <../config.h>
+#include "config.h"
 #ifdef HAVE_FREETYPE
 
 

fontEncodingPool.h

@@ -6,7 +6,7 @@
 // (C) 2003 Stefan Kebekus
 // Distributed under the GPL
 
-#include <../config.h>
+#include "config.h"
 #ifdef HAVE_FREETYPE
 
 #ifndef _FONTENCODINGPOOL_H

fontMap.cpp

@@ -5,7 +5,7 @@
 // (C) 2003 Stefan Kebekus
 // Distributed under the GPL
 
-#include <../config.h>
+#include "config.h"
 #ifdef HAVE_FREETYPE
 
 #include <kdebug.h>

fontMap.h

@@ -9,7 +9,7 @@
 #ifndef _FONTMAP_H
 #define _FONTMAP_H
 
-#include <../config.h>
+#include "config.h"
 #ifdef HAVE_FREETYPE
 
 #include <QMap>

fontpool.h

@@ -7,7 +7,7 @@
 #ifndef _FONTPOOL_H
 #define _FONTPOOL_H
 
-#include <../config.h>
+#include "config.h"
 
 #include "fontEncodingPool.h"
 #include "fontMap.h"

kdvi_multipage.cpp

@@ -21,7 +21,7 @@
 #include <kparts/part.h>
 #include <kparts/genericfactory.h>
 
-#include "../config.h"
+#include "config.h"
 #include "kdvi_multipage.h"
 #include "documentWidget.h"
 #include "dviFile.h"

optionDialogFontsWidget.cpp

@@ -15,7 +15,7 @@
 #include <qtooltip.h>
 
 
-#include "../config.h"
+#include "config.h"
 #include "fontpool.h"
 #include "optionDialogFontsWidget.h"