[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/kviewshell-0.7/kviewshell
From:       Stefan Kebekus <kebekus () kde ! org>
Date:       2006-08-16 19:50:55
Message-ID: 1155757855.922874.30056.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 573601 by kebekus:

clean up mess that I cause a few hours earlier; sorry


 M  +3 -3      plugins/djvu/Makefile.am  
 M  +2 -2      plugins/dvi/Makefile.am  
 M  +3 -3      plugins/fax/Makefile.am  
 M  +1 -1      plugins/fax/libkfaximage/Makefile.am  
 M  +3 -3      plugins/pdf/Makefile.am  
 M  +3 -3      plugins/ps/Makefile.am  
 M  +1 -1      shell/Makefile.am  


--- branches/work/kviewshell-0.7/kviewshell/plugins/djvu/Makefile.am #573600:573601
@@ -1,6 +1,6 @@
 INCLUDES = -I$(top_srcdir) $(all_includes) \
-	-I$(top_srcdir)/shell \
-	-I$(top_builddir)/shell \
+	-I$(top_srcdir)/kviewshell/shell \
+	-I$(top_builddir)/kviewshell/shell \
 	-I$(kde_includes)/kviewshell \
 	-I$(srcdir)/libdjvu
 
@@ -18,7 +18,7 @@
 
 kde_module_LTLIBRARIES = djvuviewpart.la
 djvuviewpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-djvuviewpart_la_LIBADD = -lkdeprint -lkparts $(top_builddir)/shell/libkmultipage.la \
\ +djvuviewpart_la_LIBADD = -lkdeprint -lkparts \
$(top_builddir)/kviewshell/shell/libkmultipage.la \  libdjvu/libdjvu.la
 djvuviewpart_la_SOURCES = djvumultipage.cpp djvurenderer.cpp \
kprintDialogPage_DJVUpageoptions.cpp \  kprintDialogPage_DJVUconversionoptions.cpp \
                kprintDialogPage_DJVUconversionoptions_basewidget.ui \
--- branches/work/kviewshell-0.7/kviewshell/plugins/dvi/Makefile.am #573600:573601
@@ -1,5 +1,5 @@
 # set the include path for X, qt and KDE
-INCLUDES= -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/shell \
+INCLUDES= -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/kviewshell/shell \
 	-I$(top_builddir)/shell \
 	$(all_includes) $(LIBFREETYPE_CFLAGS) $(CAIRO_CFLAGS)
 # claim, which subdirectories you want to install
@@ -52,7 +52,7 @@
 
 kdvipart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
 kdvipart_la_LIBADD = $(LIBFREETYPE_LIBS) $(CAIRO_LIBS) -lkparts \
-			$(top_builddir)/shell/libkmultipage.la
+			$(top_builddir)/kviewshell/shell/libkmultipage.la
 
 # Which sources should be compiled for squeeze.
 squeeze_SOURCES	= squeeze.c
--- branches/work/kviewshell-0.7/kviewshell/plugins/fax/Makefile.am #573600:573601
@@ -1,5 +1,5 @@
-INCLUDES = -I$(top_srcdir)/shell \
-	-I$(top_builddir)/shell \
+INCLUDES = -I$(top_srcdir)/kviewshell/shell \
+	-I$(top_builddir)/kviewshell/shell \
 	-I$(kde_includes)/kviewshell \
 	-I$(srcdir)/libkfaximage \
 	-I$(top_srcdir) $(all_includes)
@@ -16,7 +16,7 @@
 
 kde_module_LTLIBRARIES = kfaxviewpart.la
 kfaxviewpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-kfaxviewpart_la_LIBADD = -lkdeprint -lkparts $(top_builddir)/shell/libkmultipage.la \
\ +kfaxviewpart_la_LIBADD = -lkdeprint -lkparts \
$(top_builddir)/kviewshell/shell/libkmultipage.la \  libkfaximage/libkfaximage.la
 kfaxviewpart_la_SOURCES = faxmultipage.cpp faxrenderer.cpp faxprintsettings.cpp
 
--- branches/work/kviewshell-0.7/kviewshell/plugins/fax/libkfaximage/Makefile.am \
#573600:573601 @@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir) $(all_includes) -I$(top_srcdir)/shell
+INCLUDES = -I$(top_srcdir) $(all_includes) -I$(top_srcdir)/kviewshell/shell
 
 lib_LTLIBRARIES = libkfaximage.la
 libkfaximage_la_LDFLAGS = $(all_libraries) -no-undefined -avoid-version
--- branches/work/kviewshell-0.7/kviewshell/plugins/pdf/Makefile.am #573600:573601
@@ -1,6 +1,6 @@
 INCLUDES = -I$(top_srcdir) $(all_includes) $(POPPLER_CFLAGS) \
-	-I$(top_srcdir)/shell \
-	-I$(top_builddir)/shell \
+	-I$(top_srcdir)/kviewshell/shell \
+	-I$(top_builddir)/kviewshell/shell \
 	-I$(kde_includes)/kviewshell 
 
 METASOURCES = AUTO
@@ -13,7 +13,7 @@
 
 kde_module_LTLIBRARIES = pdfviewpart.la
 pdfviewpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-pdfviewpart_la_LIBADD = -lkdeprint -lkparts $(top_builddir)/shell/libkmultipage.la \
$(POPPLER_LIBS) +pdfviewpart_la_LIBADD = -lkdeprint -lkparts \
$(top_builddir)/kviewshell/shell/libkmultipage.la $(POPPLER_LIBS)  \
pdfviewpart_la_SOURCES = pdfMultipage.cpp pdfRenderer.cpp pdfWidget.cpp prefs.kcfgc \ \
optionDialogPdfWidget.cpp optionDialogPdfWidget_base.ui sourceSplitter.cpp \  \
pageInsertionWidget.cpp	pageInsertionWidget_base.ui pageRangeWidget_base.ui \
                pageRangeWidget.cpp \
--- branches/work/kviewshell-0.7/kviewshell/plugins/ps/Makefile.am #573600:573601
@@ -1,6 +1,6 @@
 INCLUDES = -I$(top_srcdir) $(all_includes) \
-	-I$(top_srcdir)/shell \
-	-I$(top_builddir)/shell \
+	-I$(top_srcdir)/kviewshell/shell \
+	-I$(top_builddir)/kviewshell/shell \
 	-I$(kde_includes)/kviewshell 
 
 METASOURCES = AUTO
@@ -13,7 +13,7 @@
 
 kde_module_LTLIBRARIES = psviewpart.la
 psviewpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-psviewpart_la_LIBADD = -lkdeprint -lkparts $(top_builddir)/shell/libkmultipage.la
+psviewpart_la_LIBADD = -lkdeprint -lkparts \
$(top_builddir)/kviewshell/shell/libkmultipage.la  psviewpart_la_SOURCES = \
psMultipage.cpp psRenderer.cpp dscparse.cpp dscparse_adapter.cpp internaldocument.cpp \
ps.c \  pageRangeWidget_base.ui pageRangeWidget.cpp documentInfoWidget_base.ui
 
--- branches/work/kviewshell-0.7/kviewshell/shell/Makefile.am #573600:573601
@@ -84,4 +84,4 @@
 	$(XGETTEXT) *.cpp *.h -o $(podir)/kviewshell.pot
 
 
-include ../admin/Doxyfile.am
+include ../../admin/Doxyfile.am


[prev in list] [next in list] [prev in thread] [next in thread]