diff options
| author | David Schleef <ds@schleef.org> | 2009-06-06 11:13:45 -0700 |
|---|---|---|
| committer | David Schleef <ds@schleef.org> | 2009-06-06 11:13:45 -0700 |
| commit | 1c20bec2095d8a44a1ffdb20c28ee6fec190e028 (patch) | |
| tree | 14d2cc8c5095d0679e93869dd8bfb4183073da4b /testsuite | |
| parent | 00f06fab5fa688298867e8ce42bbc191e2038f25 (diff) | |
| parent | 0a3f53dbf2e360bfe4050f4f590d75892bd08ac8 (diff) | |
Merge branch 'master' into neon
Conflicts:
testsuite/Makefile.am
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/Makefile.am | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am index 776501a..051ca05 100644 --- a/testsuite/Makefile.am +++ b/testsuite/Makefile.am @@ -28,23 +28,23 @@ orcbin_PROGRAMS += compile_opcodes_sys_neon \ compile_opcodes_sys_c64x AM_CFLAGS = $(ORC_CFLAGS) -LIBS = $(ORC_LIBS) $(top_builddir)/orc-test/liborc-test-0.3.la +LIBS = $(ORC_LIBS) $(top_builddir)/orc-test/liborc-test-@ORC_MAJORMINOR@.la compile_opcodes_float_c_LDADD = \ - $(top_builddir)/orc-float/liborc-float-0.3.la + $(top_builddir)/orc-float/liborc-float-@ORC_MAJORMINOR@.la compile_opcodes_float_neon_LDADD = \ - $(top_builddir)/orc-float/liborc-float-0.3.la + $(top_builddir)/orc-float/liborc-float-@ORC_MAJORMINOR@.la compile_opcodes_float_LDADD = \ - $(top_builddir)/orc-float/liborc-float-0.3.la + $(top_builddir)/orc-float/liborc-float-@ORC_MAJORMINOR@.la exec_opcodes_float_LDADD = \ - $(top_builddir)/orc-float/liborc-float-0.3.la + $(top_builddir)/orc-float/liborc-float-@ORC_MAJORMINOR@.la compile_opcodes_pixel_c_LDADD = \ - $(top_builddir)/orc-pixel/liborc-pixel-0.3.la + $(top_builddir)/orc-pixel/liborc-pixel-@ORC_MAJORMINOR@.la compile_opcodes_pixel_neon_LDADD = \ - $(top_builddir)/orc-pixel/liborc-pixel-0.3.la + $(top_builddir)/orc-pixel/liborc-pixel-@ORC_MAJORMINOR@.la compile_opcodes_pixel_LDADD = \ - $(top_builddir)/orc-pixel/liborc-pixel-0.3.la + $(top_builddir)/orc-pixel/liborc-pixel-@ORC_MAJORMINOR@.la exec_opcodes_pixel_LDADD = \ - $(top_builddir)/orc-pixel/liborc-pixel-0.3.la + $(top_builddir)/orc-pixel/liborc-pixel-@ORC_MAJORMINOR@.la |