From 75f8b00ea05e5485530fb4a74af7e9afdf5345ae Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Sun, 16 Apr 2000 19:25:56 +0000 Subject: Renamed library from libcalutil to libcal-util, to be consistent with 2000-04-16 Federico Mena Quintero * cal-util/Makefile.am: Renamed library from libcalutil to libcal-util, to be consistent with libcal-client. Install header files in $(includedir)/evolution/cal-util. (INCLUDES): Add "cal-util" log domain for glib. (libcal_clientincludedir): The header files are now installed in $(includedir)/evolution/cal-client. * cal-util/cal-util.h: Fix includes. * cal-client/client-test.c: Fix includes. * pcs/Makefile.am: Create libpcs.a, not a shared library, because it is for internal use by Wombat only. The header files should not be installed, either. Removed all the old Tlacuache stuff. * gui/Makefile.am (EXTRA_DIST): We no longer distribute gncal.desktop. (evolution_calendar_INCLUDES): Add "calendar-gui" for the glib log domain. * gui/*.[ch]: Fix cal-util and cal-client includes. * pcs/Makefile.am (INCLUDES): Added "pcs" log domain for glib. * pcs/*.[ch]: Fix cal-util includes. svn path=/trunk/; revision=2461 --- calendar/gui/Makefile.am | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) (limited to 'calendar/gui/Makefile.am') diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index d51e5a5986..2f0dab260a 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -6,8 +6,8 @@ help_base = $(datadir)/gnome/help/cal # calendar-pilot-sync #endif - INCLUDES = \ + -DG_LOG_DOMAIN=\"calendar-gui\" \ -I$(top_srcdir) \ -I$(top_srcdir)/calendar \ -I$(top_srcdir)/libical/src/libical \ @@ -17,18 +17,18 @@ INCLUDES = \ $(PISOCK_INCLUDEDIR) \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" - -LINK_FLAGS = \ - $(BONOBO_VFS_GNOME_LIBS) \ - $(INTLLIBS) \ - $(top_builddir)/calendar/cal-util/libcalutil.la \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/widgets/e-text/libetext.a \ - $(top_builddir)/libversit/libversit.la \ - $(top_builddir)/libical/src/libical/libical.la \ - $(top_builddir)/calendar/cal-client/libcal-client.la +LINK_FLAGS = \ + $(BONOBO_VFS_GNOME_LIBS) \ + $(INTLLIBS) \ + $(top_builddir)/calendar/cal-client/libcal-client.la \ + $(top_builddir)/calendar/cal-util/libcal-util.la \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/widgets/e-text/libetext.a \ + $(top_builddir)/libversit/libversit.la \ + $(top_builddir)/libical/src/libical/libical.la bin_PROGRAMS = evolution-calendar + evolution_calendar_SOURCES = \ alarm.c \ alarm.h \ @@ -182,8 +182,7 @@ gnorba_DATA = calendar-control.gnorba #Conduits_second_DATA = $(Conduits_DATA) #endif -EXTRA_DIST = \ - gncal.desktop \ +EXTRA_DIST = \ bell.xpm \ recur.xpm @@ -196,10 +195,6 @@ EXTRA_DIST = \ #appicondir = $(datadir)/pixmaps #appicon_DATA = gnome-calendar-conduit.png -Productivitydir = $(datadir)/gnome/apps/Applications - -Productivity_DATA = gncal.desktop - install-data-local: $(mkinstalldirs) $(DESTDIR)$(help_base)/C # $(mkinstalldirs) $(Conduitsdir) -- cgit v1.2.3