diff options
| author | Hans Ulrich Niedermann <gp@n-dimensional.de> | 2007-08-14 13:44:15 +0000 |
|---|---|---|
| committer | Hans Ulrich Niedermann <gp@n-dimensional.de> | 2007-08-14 13:44:15 +0000 |
| commit | 918364e2ecbb4b5452eccd0f9e4c38e7f45bf710 (patch) | |
| tree | c43baa30b0076d279f080d5f021b2669979155b1 /libgphoto2_port/test | |
| parent | 0a7e70fffb32823b0843f857af292f2ccc3a7839 (diff) | |
| download | libgphoto2-918364e2ecbb4b5452eccd0f9e4c38e7f45bf710.tar.gz | |
Non-recursive iolib build
* Makes "make -j2" useful
* Makes dynamic load checks without install possible.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@10587 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'libgphoto2_port/test')
| -rw-r--r-- | libgphoto2_port/test/Makefile.am | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libgphoto2_port/test/Makefile.am b/libgphoto2_port/test/Makefile.am index ea62fc25b..229dd346e 100644 --- a/libgphoto2_port/test/Makefile.am +++ b/libgphoto2_port/test/Makefile.am @@ -5,12 +5,12 @@ noinst_PROGRAMS = # When we build all our iolibs in one directory, we can run our checks # with IOLIBS set to the camlib build directory. -#TESTS_ENVIRONMENT = env \ -# CAMLIBS="$(top_builddir)" +TESTS_ENVIRONMENT = env \ + IOLIBS="$(top_builddir)" # After installation, this will be IOLIBS = $(DESTDIR)$(iolibdir) INSTALL_TESTS_ENVIRONMENT = env \ - CAMLIBS="$(DESTDIR)$(iolibdir)" \ + IOLIBS="$(DESTDIR)$(iolibdir)" \ LD_LIBRARY_PATH="$(DESTDIR)$(libdir)$${LD_LIBRARY_PATH+:$${LD_LIBRARY_PATH}}" noinst_PROGRAMS += test-gp-port @@ -18,7 +18,7 @@ test_gp_port_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL) $(CPPFLAGS) test_gp_port_SOURCE = test-gp-port.c test_gp_port_LDFLAGS = $(top_builddir)/libgphoto2_port/libgphoto2_port.la $(LIBLTDL) $(INTLLIBS) -#TESTS += test-port-list +TESTS += test-port-list INSTALL_TESTS += test-port-list check_PROGRAMS += test-port-list test_port_list_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL) $(CPPFLAGS) |