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

List:       kde-commits
Subject:    KDE_3_2_BRANCH: kdegraphics/kghostview
From:       Dominique Devriese <devriese () kde ! org>
Date:       2004-02-28 16:44:36
Message-ID: 20040228164436.8C6A79953 () office ! kde ! org
[Download RAW message or body]

CVS commit by domi: 

Create a library libkghostviewlib.la against which kghostview and
libkghostviewpart.la both link.  This fixes the current situation
where kghostview links against its own part, which leads to problems
relating to install locations and rpathing in the Debian packages.

Noone objected on core-devel.

CCMAIL:debian-qt-kde@lists.debian.org


  M +1 -1      .cvsignore   1.8.2.1
  M +12 -4     Makefile.am   1.79.2.1


--- kdegraphics/kghostview/.cvsignore  #1.8:1.8.2.1
@@ -13,3 +13,3 @@
 gssettingswidget.cpp
 gssettingswidget.h
-
+part_dummy.cpp

--- kdegraphics/kghostview/Makefile.am  #1.79:1.79.2.1
@@ -6,13 +6,16 @@
 
 bin_PROGRAMS =  kghostview
+lib_LTLIBRARIES = libkghostviewlib.la
 kde_module_LTLIBRARIES = libkghostviewpart.la
 noinst_LTLIBRARIES = libdscparse.la
 
+libkghostviewlib_la_LDFLAGS = $(all_libraries)
+libkghostviewlib_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -lkdeprint libdscparse.la
+
 libkghostviewpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-libkghostviewpart_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -lkdeprint \
-        libdscparse.la
+libkghostviewpart_la_LIBADD = libkghostviewlib.la
 
 # Check "make final" after making changes to the following line!!
-libkghostviewpart_la_SOURCES = kgvshell.cpp kgvdocument.cpp kgv_miniwidget.cpp \
+libkghostviewlib_la_SOURCES = kgvshell.cpp kgvdocument.cpp kgv_miniwidget.cpp \
         marklist.cpp logwindow.cpp infodialog.cpp \
         kgvpageview.cpp ps.c kgv_view.cpp scrollbox.cpp  kgvpagedecorator.cpp \
@@ -22,7 +25,12 @@
     generalsettingswidget.ui gssettingswidget.ui thumbnailservice.cpp
 
+libkghostviewpart_la_SOURCES = part_dummy.cpp
+
+part_dummy.cpp:
+        touch part_dummy.cpp
+
 kghostview_SOURCES = main.cpp
 kghostview_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-kghostview_LDADD = libkghostviewpart.la
+kghostview_LDADD = libkghostviewlib.la
 
 libdscparse_la_LDFLAGS = $(all_libraries) -no-undefined


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