Re: [Ekiga-devel-list] kde in tarball



Hi,

Please apply the attached patch, which adds the kde-core directory to the tarball.

Eugen

Julien Puydt wrote:
Eugen Dedu a écrit :
Hi,

lib/engine/gui/Makefile.am is:
SUBDIRS = gtk-core gtk-frontend

"ls lib/engine/gui" shows 3 directories:
drwxr-xr-x 5 dedu   984 Feb  6 16:55 gtk-core
drwxr-xr-x 5 dedu  1736 Feb  6 16:55 gtk-frontend
drwxr-xr-x 3 dedu   168 Feb  6 18:07 kde-core

When I create the tarball (make dist), kde-core is not put inside. I suppose it is useful to have this directory in the tarball, so how to add it? Shouldn't kde-core be included to the Makefile.am above ?


Uh... it should be conditionally added.

--- ekiga-svn/configure.ac	2009-01-29 19:00:18.000000000 +0100
+++ ekiga-3.1.1/configure.ac	2009-02-16 19:39:58.000000000 +0100
@@ -763,6 +763,7 @@
 lib/engine/gui/Makefile
 lib/engine/gui/gtk-core/Makefile
 lib/engine/gui/gtk-frontend/Makefile
+lib/engine/gui/kde-core/Makefile
 lib/engine/components/Makefile
 lib/engine/components/gmconf-personal-details/Makefile
 lib/engine/components/avahi-publisher/Makefile
diff -ru ekiga-svn/lib/engine/gui/Makefile.am ekiga-3.1.1/lib/engine/gui/Makefile.am
--- ekiga-svn/lib/engine/gui/Makefile.am	2009-01-07 11:02:11.000000000 +0100
+++ ekiga-3.1.1/lib/engine/gui/Makefile.am	2009-02-16 19:39:37.000000000 +0100
@@ -1 +1,5 @@
 SUBDIRS = gtk-core gtk-frontend
+
+if HAVE_KDE
+SUBDIRS += kde-core
+endif
--- ekiga-svn/lib/engine/gui/kde-core/Makefile.am	2009-01-07 11:02:11.000000000 +0100
+++ ekiga-tarb2/lib/engine/gui/kde-core/Makefile.am	2009-02-16 20:16:16.000000000 +0100
@@ -4,7 +4,7 @@
 noinst_LTLIBRARIES = libgmkde-core.la
 endif
 
-kde_core_dir = $(top_srcdir)/gui/kde-core
+kde_core_dir = $(top_srcdir)/lib/engine/gui/kde-core
 
 AM_CPPFLAGS = $(KAB_CFLAGS) $(GTK_CFLAGS)
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]