diff options
| author | Hans Petter Jansson <hpj@ximian.com> | 2003-09-22 15:32:34 +0800 |
|---|---|---|
| committer | Hans Petter <hansp@src.gnome.org> | 2003-09-22 15:32:34 +0800 |
| commit | c5a06d54f661243c0775dd3d40e173e661616c1b (patch) | |
| tree | c5dae46f26c445eed43e883386643303039b893c /libical/src/test | |
| parent | 88d4fd5eac6bf7bcfd845f548efabc9801199cd2 (diff) | |
| download | gsoc2013-evolution-c5a06d54f661243c0775dd3d40e173e661616c1b.tar gsoc2013-evolution-c5a06d54f661243c0775dd3d40e173e661616c1b.tar.gz gsoc2013-evolution-c5a06d54f661243c0775dd3d40e173e661616c1b.tar.bz2 gsoc2013-evolution-c5a06d54f661243c0775dd3d40e173e661616c1b.tar.lz gsoc2013-evolution-c5a06d54f661243c0775dd3d40e173e661616c1b.tar.xz gsoc2013-evolution-c5a06d54f661243c0775dd3d40e173e661616c1b.tar.zst gsoc2013-evolution-c5a06d54f661243c0775dd3d40e173e661616c1b.zip | |
libical.la -> libical-evolution.la
2003-09-22 Hans Petter Jansson <hpj@ximian.com>
* calendar/cal-util/Makefile.am (libical_util_la_LIBADD):
libical.la -> libical-evolution.la
* calendar/importers/Makefile.am
(libevolution_calendar_importers_la_LIBADD):
libicalvcal.la -> libicalvcal-evolution.la
* shell/Makefile.am (evolution_LDADD):
libical.la -> libical-evolution.la
* libical/configure.in: Require flex 2.5.31 and add a test for it.
Rename WITH_CXX conditional to WITH_CXX_BINDINGS.
* libical/examples/Makefile.am (doesnothing_LDADD): Add -evolution to
lib names.
* libical/src/test/Makefile.am: WITH_CXX -> WITH_CXX_BINDINGS. Add
-evolution to lib names.
* libical/src/test/regression.c (main): WITH_CXX -> WITH_CXX_BINDINGS.
* libical/src/libicalcap/Makefile.am: Add -evolution to lib names.
Install to Evolution's priv dirs.
* libical/src/libicalvcal/Makefile.am: Ditto.
* libical/src/libical/Makefile.am: WITH_CXX -> WITH_CXX_BINDINGS. Add
-evolution to lib names. Install in privlibdir. Install includes to
$(privincludedir)/libical.
* libical/src/libicalss/Makefile.am: Ditto.
* libical/src/libicalss/icalsslexer.l: Replace option reentrant-bison
with reentrant and bison-bridge. Use new Flex variable names.
* libical/src/libical/icallexer.l:
* libical/src/libical/icalyacc.y:
* libical/src/libicalss/icalsslexer.c:
* libical/src/libicalss/icalssyacc.c:
* libical/src/libicalss/icalssyacc.h: Removed from repository.
svn path=/trunk/; revision=22633
Diffstat (limited to 'libical/src/test')
| -rw-r--r-- | libical/src/test/Makefile.am | 10 | ||||
| -rw-r--r-- | libical/src/test/regression.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libical/src/test/Makefile.am b/libical/src/test/Makefile.am index 4892507869..8b7f3e9672 100644 --- a/libical/src/test/Makefile.am +++ b/libical/src/test/Makefile.am @@ -1,12 +1,12 @@ -if WITH_CXX -cxx_inc=-DWITH_CXX -cxx_libs=../libical/libical_cxx.la +if WITH_CXX_BINDINGS +cxx_inc=-DWITH_CXX_BINDINGS +cxx_libs=../libical/libical-evolution_cxx.la regression_cxx = regression-cxx.cpp else cxx_inc= cxx_libs= regression_cxx = -CXX=@CC@ +AM_CXX=@CC@ endif if WITH_BDB4 @@ -19,7 +19,7 @@ endif noinst_PROGRAMS = copycluster regression parser stow recur testmime testvcal process -LDADD = ../libicalss/libicalss.la ../libicalvcal/libicalvcal.la $(cxx_libs) ../libical/libical.la $(bdb4_libs) +LDADD = ../libicalss/libicalss-evolution.la ../libicalvcal/libicalvcal-evolution.la $(cxx_libs) ../libical/libical-evolution.la $(bdb4_libs) LIBS = @PTHREAD_LIBS@ diff --git a/libical/src/test/regression.c b/libical/src/test/regression.c index 1e9fc8e2c5..d4fc276e6b 100644 --- a/libical/src/test/regression.c +++ b/libical/src/test/regression.c @@ -3646,7 +3646,7 @@ int main(int argc, char *argv[]) /** OPTIONAL TESTS go here... **/ -#ifdef WITH_CXX +#ifdef WITH_CXX_BINDINGS test_run("Test C++ API", test_cxx, do_test, do_header); #endif |