callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove libcal-util-static.la

Browse Source 
* cal-util/Makefile.am (privlib_LTLIBRARIES): Remove
        libcal-util-static.la

        * cal-client/Makefile.am (noinst_LTLIBRARIES): Remove
        libcal-client-static.la

        * conduits/calendar/Makefile.am (libecalendar_conduit_la_LIBADD):
        use non-static libraries. The static ones were only needed for
        libtool 1.3.

        * conduits/todo/Makefile.am (libetodo_conduit_la_LIBADD): Likewise

        * gui/Makefile.am (IDL_GENERATED): Don't compile the calendar idl
        here. It's already in libcal-client.

svn path=/trunk/; revision=22430
This commit is contained in:
Dan Winship
2003-09-01 06:15:35 +00:00
parent 1537b6f23c
commit 9a763746cc
6 changed files with 26 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
calendar/ChangeLog
View File

@ -1,3 +1,20 @@
2003-09-11 Dan Winship <danw@ximian.com>
* cal-util/Makefile.am (privlib_LTLIBRARIES): Remove
libcal-util-static.la
* cal-client/Makefile.am (noinst_LTLIBRARIES): Remove
libcal-client-static.la
* conduits/calendar/Makefile.am (libecalendar_conduit_la_LIBADD):
use non-static libraries. The static ones were only needed for
libtool 1.3.
* conduits/todo/Makefile.am (libetodo_conduit_la_LIBADD): Likewise
* gui/Makefile.am (IDL_GENERATED): Don't compile the calendar idl
here. It's already in libcal-client.
2003-09-11 Frederic Crozat <fcrozat@mandrakesoft.com>
* conduits/todo/Makefile.am:

8
calendar/cal-client/Makefile.am
View File

@ -56,14 +56,6 @@ libcal_clientinclude_HEADERS = \
cal-client.h \
cal-query.h
#
# make a static library for use by calendar conduit's shared library
#
noinst_LTLIBRARIES = libcal-client-static.la
libcal_client_static_la_SOURCES = $(libcal_client_la_SOURCES)
libcal_client_static_la_LDFLAGS = --all-static
#
# client-test program
#

9
calendar/cal-util/Makefile.am
View File

@ -15,7 +15,7 @@ INCLUDES = \
# cal util library
#
privlib_LTLIBRARIES = libcal-util-static.la libcal-util.la
privlib_LTLIBRARIES = libcal-util.la
libcal_util_la_SOURCES = \
cal-util-marshal.c \
@ -42,13 +42,6 @@ MARSHAL_GENERATED = cal-util-marshal.c cal-util-marshal.h
BUILT_SOURCES = $(MARSHAL_GENERATED)
CLEANFILES = $(BUILT_SOURCES)
#
# static library for use in conduits' shared libraries
#
#lib_LTLIBRARIES = libcal-util-static.la
libcal_util_static_la_SOURCES = $(libcal_util_la_SOURCES)
libcal_util_static_la_LDFLAGS = -all-static
test_recur_SOURCES = \
test-recur.c

6
calendar/conduits/calendar/Makefile.am
View File

@ -18,10 +18,10 @@ libecalendar_conduit_la_SOURCES = \
libecalendar_conduit_la_LDFLAGS = -module -avoid-version
libecalendar_conduit_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/calendar/cal-client/libcal-client-static.la \
$(top_builddir)/calendar/cal-util/libcal-util-static.la \
$(top_builddir)/calendar/cal-client/libcal-client.la \
$(top_builddir)/calendar/cal-util/libcal-util.la \
$(top_builddir)/libversit/libversit.la \
$(top_builddir)/libical/src/libical/libical-static.la \
$(top_builddir)/libical/src/libical/libical.la \
$(top_builddir)/e-util/libeconduit.la \
$(EVOLUTION_CALENDAR_CONDUIT_LIBS)

8
calendar/conduits/todo/Makefile.am
View File

@ -18,11 +18,11 @@ libetodo_conduit_la_SOURCES = \
libetodo_conduit_la_LDFLAGS = -module -avoid-version
libetodo_conduit_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/calendar/cal-client/libcal-client-static.la \
$(top_builddir)/calendar/cal-util/libcal-util-static.la \
$(top_builddir)/calendar/cal-client/libcal-client.la \
$(top_builddir)/calendar/cal-util/libcal-util.la \
$(top_builddir)/libversit/libversit.la \
$(top_builddir)/libical/src/libical/libical-static.la \
$(top_builddir)/libwombat/libwombat-static.la \
$(top_builddir)/libical/src/libical/libical.la \
$(top_builddir)/libwombat/libwombat.la \
$(top_builddir)/e-util/libeconduit.la \
$(EVOLUTION_CALENDAR_CONDUIT_LIBS)

18
calendar/gui/Makefile.am
View File

@ -37,23 +37,7 @@ $(SELECT_NAMES_IDL_GENERATED_H): $(IDLS)
$(SELECT_NAMES_IDL_GENERATED_C): $(SELECT_NAMES_IDL_GENERATED_H)
# Calendar IDL files
CALENDAR_IDL_GENERATED_H = \
evolution-calendar.h
CALENDAR_IDL_GENERATED_C = \
evolution-calendar-common.c \
evolution-calendar-skels.c \
evolution-calendar-stubs.c
CALENDAR_IDL_GENERATED = $(CALENDAR_IDL_GENERATED_C) $(CALENDAR_IDL_GENERATED_H)
$(CALENDAR_IDL_GENERATED_H): $(IDLS)
$(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES) \
$(top_srcdir)/calendar/idl/evolution-calendar.idl
$(CALENDAR_IDL_GENERATED_C): $(CALENDAR_IDL_GENERATED_H)
IDL_GENERATED = $(COMPOSER_IDL_GENERATED) $(SELECT_NAMES_IDL_GENERATED) $(CALENDAR_IDL_GENERATED)
IDL_GENERATED = $(COMPOSER_IDL_GENERATED) $(SELECT_NAMES_IDL_GENERATED)
SUBDIRS = alarm-notify dialogs