Rename ical libraries to have _lgpl suffix (to be consistent with libart).

Fix .def files so that the dynamic libs compile on win32 (thanks to Mostafa Hosseini <mostafah@oeone.com> for the patch)
Bug #178798 r=blizzard


git-svn-id: svn://10.0.0.236/trunk@135191 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
seawood%netscape.com 2002-12-12 23:03:26 +00:00
parent b396944e0c
commit 541204967e
5 changed files with 19 additions and 17 deletions

View File

@ -72,8 +72,8 @@ CPPSRCS = \
EXTRA_DSO_LDOPTS += \
$(LIBS_DIR) \
$(MOZ_COMPONENT_LIBS) \
-lmozicalss \
-lmozical \
-lmozicalss_lgpl \
-lmozical_lgpl \
$(NULL)
DEFINES += -DICAL_DEBUG

View File

@ -29,7 +29,7 @@ include $(DEPTH)/config/autoconf.mk
include $(srcdir)/objs.mk
MODULE = ical
LIBRARY_NAME=mozical
LIBRARY_NAME=mozical_lgpl
ifeq ($(OS_ARCH),WINNT)
MAPFILE = $(LIBRARY_NAME).map
@ -102,6 +102,8 @@ BUILT_SOURCES = \
#//
#//------------------------------------------------------------------------
SRCS_IN_OBJDIR = 1
include $(topsrcdir)/config/rules.mk
exports:: $(BUILT_SOURCES)
@ -121,10 +123,10 @@ PARAMETERDEPS = \
$(srcdir)/icalderivedparameter.h.in
icalderivedparameter.h: $(PARAMETERDEPS) Makefile
$(PERL) -I $(ICALSCRIPTS) $(ICALSCRIPTS)/mkderivedparameters.pl -i $(srcdir)/icalderivedparameter.h.in -h $(DESIGNDATA)/parameters.csv > icalderivedparameter.h
$(PERL) -I$(ICALSCRIPTS) $(ICALSCRIPTS)/mkderivedparameters.pl -i $(srcdir)/icalderivedparameter.h.in -h $(DESIGNDATA)/parameters.csv > icalderivedparameter.h
icalderivedparameter.c: $(PARAMETERDEPS) $(BUILT_COMBINEDHEADERS) Makefile
$(PERL) -I $(ICALSCRIPTS) $(ICALSCRIPTS)/mkderivedparameters.pl -i $(srcdir)/icalderivedparameter.c.in -c $(DESIGNDATA)/parameters.csv > icalderivedparameter.c
$(PERL) -I$(ICALSCRIPTS) $(ICALSCRIPTS)/mkderivedparameters.pl -i $(srcdir)/icalderivedparameter.c.in -c $(DESIGNDATA)/parameters.csv > icalderivedparameter.c
# values

View File

@ -1,4 +1,4 @@
LIBRARY "ical"
LIBRARY "mozical_lgpl"
DESCRIPTION '"""ical library"""'
@ -164,11 +164,9 @@ EXPORTS
icalproperty_get_class @145
icalproperty_get_priority @146
icalproperty_get_url @147
icaldurationtype_null_duration @148
icaltime_add @149
icaltime_subtract @150
icalproperty_get_dtend @151
icaldurationtype_is_null_duration @152
icalproperty_get_duration @153

View File

@ -35,7 +35,7 @@ include $(DEPTH)/config/autoconf.mk
include $(srcdir)/objs.mk
MODULE = icalss
LIBRARY_NAME=mozicalss
LIBRARY_NAME=mozicalss_lgpl
ifneq ($(OS_ARCH),WINNT)
SHORT_LIBNAME=mozicals
endif
@ -55,7 +55,7 @@ EXPORTS = $(ICALSS_SRC_LEXPORTS)
FORCE_SHARED_LIB=1
LOCAL_INCLUDES = -I$(srcdir) -I$(srcdir)/../libical
REQUIRES = ical
EXTRA_DSO_LIBS = mozical
EXTRA_DSO_LIBS = mozical_lgpl
EXTRA_DSO_LDOPTS = \
$(LIBS_DIR) \
$(EXTRA_DSO_LIBS) \
@ -67,4 +67,6 @@ EXTRA_DSO_LDOPTS = \
#//
#//------------------------------------------------------------------------
SRCS_IN_OBJDIR = 1
include $(topsrcdir)/config/rules.mk

View File

@ -1,4 +1,4 @@
LIBRARY "icalss"
LIBRARY "mozicalss_lgpl"
DESCRIPTION '"""icalss library"""'