From: JP Rosevear Date: Fri, 7 Nov 2003 03:05:29 +0000 (+0000) Subject: output new .pc file X-Git-Tag: upstream/3.7.4~9761 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d7fb94ce25aeda5f0a75527846f50a61a5596a46;p=platform%2Fupstream%2Fevolution-data-server.git output new .pc file 2003-11-06 JP Rosevear * configure.in: output new .pc file * evolution-data-server-1.0.pc.in: pkconfig for idl * libedataserver/ename/Makefile.am: don't install * libedataserver/Makefile.am: link in libename 2003-11-06 JP Rosevear * libebook/Makefile.am: don't add libename --- diff --git a/.cvsignore b/.cvsignore index b2049d1..07b2138 100644 --- a/.cvsignore +++ b/.cvsignore @@ -26,6 +26,5 @@ stamp.h xml-i18n-* xlibtool xltmain.sh -evolution.spec intltool-* *.pc diff --git a/ChangeLog b/ChangeLog index 93e68e5..456fa59 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2003-11-06 + + * evolution-data-server-1.0.pc.in: pkconfig for idl + + * libedataserver/ename/Makefile.am: don't install + + * libedataserver/Makefile.am: link in libename + 2003-11-06 Rodney Dawes * configure.in: Remove dependencies for GUI libs that we don't need diff --git a/Makefile.am b/Makefile.am index 8e32d5e..944fa8a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,6 +5,9 @@ ACLOCAL_AMFLAGS = -I m4 changelogs = \ ChangeLog +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = evolution-data-server-1.0.pc + EXTRA_DIST = \ AUTHORS \ $(changelogs) \ @@ -16,4 +19,5 @@ EXTRA_DIST = \ marshal.mk \ intltool-merge.in \ intltool-update.in \ - intltool-extract.in + intltool-extract.in \ + $(pkgconfig_DATA:.pc=.pc.in) diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 2ef6631..c6c066f 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,7 @@ +2003-11-06 + + * libebook/Makefile.am: don't add libename + 2003-11-06 JP Rosevear * libebook/e-book.c: replace e_mutex stuff with gthread stuff diff --git a/addressbook/libebook/Makefile.am b/addressbook/libebook/Makefile.am index d7e86f5..b38ecea 100644 --- a/addressbook/libebook/Makefile.am +++ b/addressbook/libebook/Makefile.am @@ -48,8 +48,7 @@ libebook_la_SOURCES = \ e-vcard.c libebook_la_LIBADD = \ - $(top_builddir)/libedataserver/libedataserver.la\ - $(top_builddir)/libedataserver/ename/libename.la + $(top_builddir)/libedataserver/libedataserver.la libebook_la_LDFLAGS = \ -version-info $(LIBEBOOK_CURRENT):$(LIBEBOOK_REVISION):$(LIBEBOOK_AGE) \ diff --git a/configure.in b/configure.in index db00d7b..01f2f22 100644 --- a/configure.in +++ b/configure.in @@ -688,6 +688,7 @@ AC_CONFIG_SUBDIRS(calendar/libical) AC_OUTPUT([ Makefile +evolution-data-server-1.0.pc addressbook/Makefile addressbook/idl/Makefile addressbook/libebook/Makefile diff --git a/evolution-data-server-1.0.pc.in b/evolution-data-server-1.0.pc.in new file mode 100644 index 0000000..a76c891 --- /dev/null +++ b/evolution-data-server-1.0.pc.in @@ -0,0 +1,12 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +idldir=@idldir@ +IDL_INCLUDES=-I ${idldir} @IDL_INCLUDES@ + +Name: evolution-data-server +Description: The evolution data server for the calendar and addressbook +Version: @VERSION@ +Requires: libgnome-2.0 libbonobo-2.0 \ No newline at end of file diff --git a/libedataserver/Makefile.am b/libedataserver/Makefile.am index 726d050..bd74b91 100644 --- a/libedataserver/Makefile.am +++ b/libedataserver/Makefile.am @@ -33,7 +33,7 @@ libedataserver_la_SOURCES = \ libedataserver_la_LIBADD = \ $(DB3_LDADD) \ - $(E_DATA_SERVER_LIBS) + $(top_builddir)/libedataserver/ename/libename.la libedataserver_la_LDFLAGS = \ -version-info $(LIBEDATASERVER_CURRENT):$(LIBEDATASERVER_REVISION):$(LIBEDATASERVER_AGE) \ diff --git a/libedataserver/ename/Makefile.am b/libedataserver/ename/Makefile.am index 798215c..9721fb8 100644 --- a/libedataserver/ename/Makefile.am +++ b/libedataserver/ename/Makefile.am @@ -8,7 +8,7 @@ INCLUDES = \ -I$(top_builddir) \ $(E_NAME_CFLAGS) -lib_LTLIBRARIES = libename.la +noinst_LTLIBRARIES = libename.la libename_la_SOURCES = \ e-address-western.c \