139 lines
6.6 KiB
Diff
139 lines
6.6 KiB
Diff
diff -urNp libical-0.32.orig/src/libical/Makefile.in libical-0.32/src/libical/Makefile.in
|
|
--- libical-0.32.orig/src/libical/Makefile.in 2008-09-02 00:06:16.000000000 +0530
|
|
+++ libical-0.32/src/libical/Makefile.in 2008-09-02 20:02:36.195993974 +0530
|
|
@@ -103,7 +103,7 @@ am_libical_la_OBJECTS = $(am__objects_2)
|
|
icalduration.lo icalperiod.lo icaltypes.lo icalvalue.lo pvl.lo \
|
|
sspm.lo vsnprintf.lo icallangbind.lo caldate.lo
|
|
libical_la_OBJECTS = $(am_libical_la_OBJECTS)
|
|
-libical_cxx_la_LIBADD =
|
|
+libical_cxx_la_LIBADD = $(PTHREAD_LIBS)
|
|
am__libical_cxx_la_SOURCES_DIST = icalderivedparameter.h \
|
|
icalderivedproperty.h icalderivedvalue.h \
|
|
icalderivedparameter.c icalderivedproperty.c icalrestriction.c \
|
|
diff -urNp libical-0.32.orig/src/libicalss/Makefile.in libical-0.32/src/libicalss/Makefile.in
|
|
--- libical-0.32.orig/src/libicalss/Makefile.in 2008-09-02 00:06:16.000000000 +0530
|
|
+++ libical-0.32/src/libicalss/Makefile.in 2008-09-02 21:56:38.509744465 +0530
|
|
@@ -100,7 +100,6 @@ am_libicalss_la_OBJECTS = icalcalendar.l
|
|
icalset.lo icalspanlist.lo icalmessage.lo $(am__objects_1) \
|
|
$(am__objects_2)
|
|
libicalss_la_OBJECTS = $(am_libicalss_la_OBJECTS)
|
|
-libicalss_cxx_la_LIBADD =
|
|
am__libicalss_cxx_la_SOURCES_DIST = icalspanlist_cxx.h \
|
|
icalspanlist_cxx.cpp
|
|
@WITH_CXX_BINDINGS_TRUE@am_libicalss_cxx_la_OBJECTS = \
|
|
@@ -307,7 +306,7 @@ INCLUDES = \
|
|
$(BDB_INCLUDE)
|
|
|
|
libicalss_la_LDFLAGS = -version-info 32:0:32
|
|
-libicalss_la_LIBADD = $(BDB_LIBFILES)
|
|
+libicalss_la_LIBADD = $(BDB_LIBFILES) ../libical/libical.la
|
|
@DEV_FALSE@libicalss_la_DEVSOURCES = icalsslexer.c icalssyacc.c
|
|
@DEV_TRUE@libicalss_la_DEVSOURCES = icalsslexer.l icalssyacc.y
|
|
libicalss_la_SOURCES = \
|
|
@@ -350,6 +349,8 @@ COMBINEDHEADERS = \
|
|
$(srcdir)/icalspanlist.h \
|
|
$(srcdir)/icalmessage.h
|
|
|
|
+libicalss_cxx_la_LIBADD = ./libicalss.la ../libical/libical_cxx.la
|
|
+libicalss_cxx_la_DEPENDENCIES = ./libicalss.la ../libical/libical_cxx.la
|
|
@WITH_CXX_BINDINGS_TRUE@libicalss_cxx_la_SOURCES = \
|
|
@WITH_CXX_BINDINGS_TRUE@ $(libicalss_evolution_la_SOURCES) \
|
|
@WITH_CXX_BINDINGS_TRUE@ icalspanlist_cxx.h \
|
|
diff -urNp libical-0.32.orig/src/test/Makefile.in libical-0.32/src/test/Makefile.in
|
|
--- libical-0.32.orig/src/test/Makefile.in 2008-09-02 00:06:17.000000000 +0530
|
|
+++ libical-0.32/src/test/Makefile.in 2008-09-02 21:30:44.140744843 +0530
|
|
@@ -78,10 +78,11 @@ recur_LDADD = $(LDADD)
|
|
recur_DEPENDENCIES = ../libicalss/libicalss.la \
|
|
../libicalvcal/libicalvcal.la $(am__DEPENDENCIES_1) \
|
|
../libical/libical.la $(am__DEPENDENCIES_2)
|
|
+@WITH_CXX_BINDINGS_TRUE@am__objects_1 = regression-cxx.$(OBJEXT)
|
|
am_regression_OBJECTS = regression.$(OBJEXT) \
|
|
regression-component.$(OBJEXT) regression-classify.$(OBJEXT) \
|
|
regression-utils.$(OBJEXT) regression-recur.$(OBJEXT) \
|
|
- regression-storage.$(OBJEXT)
|
|
+ regression-storage.$(OBJEXT) $(am__objects_1)
|
|
regression_OBJECTS = $(am_regression_OBJECTS)
|
|
regression_LDADD = $(LDADD)
|
|
regression_DEPENDENCIES = ../libicalss/libicalss.la \
|
|
@@ -116,6 +117,11 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=c
|
|
CCLD = $(CC)
|
|
LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
|
|
$(AM_LDFLAGS) $(LDFLAGS) -o $@
|
|
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
|
|
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
|
|
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
|
|
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
|
|
+ $(AM_CXXFLAGS) $(CXXFLAGS)
|
|
SOURCES = $(copycluster_SOURCES) $(parser_SOURCES) $(process_SOURCES) \
|
|
$(recur_SOURCES) $(regression_SOURCES) $(stow_SOURCES) \
|
|
$(testmime_SOURCES) $(testvcal_SOURCES)
|
|
@@ -270,13 +276,6 @@ target_vendor = @target_vendor@
|
|
@WITH_CXX_BINDINGS_FALSE@cxx_libs =
|
|
@WITH_CXX_BINDINGS_TRUE@cxx_libs = ../libical/libical_cxx.la
|
|
@WITH_CXX_BINDINGS_TRUE@regression_cxx_SOURCES = \
|
|
-@WITH_CXX_BINDINGS_TRUE@ regression.c \
|
|
-@WITH_CXX_BINDINGS_TRUE@ regression.h \
|
|
-@WITH_CXX_BINDINGS_TRUE@ regression-component.c \
|
|
-@WITH_CXX_BINDINGS_TRUE@ regression-classify.c \
|
|
-@WITH_CXX_BINDINGS_TRUE@ regression-utils.c \
|
|
-@WITH_CXX_BINDINGS_TRUE@ regression-recur.c \
|
|
-@WITH_CXX_BINDINGS_TRUE@ regression-storage.c \
|
|
@WITH_CXX_BINDINGS_TRUE@ regression-cxx.cpp
|
|
|
|
@WITH_BDB4_FALSE@bdb4_inc =
|
|
@@ -301,7 +300,8 @@ regression_SOURCES = \
|
|
regression-classify.c \
|
|
regression-utils.c \
|
|
regression-recur.c \
|
|
- regression-storage.c
|
|
+ regression-storage.c \
|
|
+ $(regression_cxx_SOURCES)
|
|
|
|
TESTS = regression
|
|
copycluster_SOURCES = copycluster.c
|
|
@@ -321,7 +321,7 @@ CLEANFILES = \
|
|
all: all-am
|
|
|
|
.SUFFIXES:
|
|
-.SUFFIXES: .c .lo .o .obj
|
|
+.SUFFIXES: .c .cpp .lo .o .obj
|
|
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
|
|
@for dep in $?; do \
|
|
case '$(am__configure_deps)' in \
|
|
@@ -395,6 +395,7 @@ distclean-compile:
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/recur.Po@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regression-classify.Po@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regression-component.Po@am__quote@
|
|
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regression-cxx.Po@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regression-recur.Po@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regression-storage.Po@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regression-utils.Po@am__quote@
|
|
@@ -424,6 +425,27 @@ distclean-compile:
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
|
|
|
|
+.cpp.o:
|
|
+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
|
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
|
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
|
|
+
|
|
+.cpp.obj:
|
|
+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
|
|
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
|
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
|
|
+
|
|
+.cpp.lo:
|
|
+@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
|
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
|
|
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
|
|
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
+@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
|
|
+
|
|
mostlyclean-libtool:
|
|
-rm -f *.lo
|
|
|