[Projects] [ranch] 30: make install works properly.

https://svn.lrde.epita.fr/svn/ranch/trunk Index: ChangeLog from Nicolas Desprès &lt;nicolas.despres(a)lrde.epita.fr&gt; make install works properly. * lib/cxx/test/Makefile.am:, * lib/cxx/demo/Makefile.am: The library is in ranch-cxx. * lib/cxx/src/Makefile.am: New. Forward to ranch-cxx * lib/cxx/src/ranch-cxx/misc/Makefile.am:, * lib/cxx/src/ranch-cxx/dumper/Makefile.am:, * lib/cxx/src/ranch-cxx/input/Makefile.am:, * lib/cxx/src/ranch-cxx/output/Makefile.am:, * lib/cxx/src/ranch-cxx/Makefile.am: Install include files in ranch-cxx. * lib/cxx/configure.ac: Add src/Makefile.am. * lib/cxx/src/ranch-cxx/ranch.mk: Move to ... * lib/cxx/src/ranch.mk: ... here. * lib/cxx/src/ranch-cxx/inputs.hh:, * lib/cxx/src/ranch-cxx/outputs.hh:, * lib/cxx/src/ranch-cxx/inputs.hxx:, * lib/cxx/src/ranch-cxx/outputs.hxx:, * lib/cxx/src/ranch-cxx/ranch.hh:, * lib/cxx/src/ranch-cxx/bencher.cc:, * lib/cxx/src/ranch-cxx/misc/yamlize.hxx:, * lib/cxx/src/ranch-cxx/misc/yamlize.hh:, * lib/cxx/src/ranch-cxx/misc/yamlize.cc:, * lib/cxx/src/ranch-cxx/dumper/dumper.cc:, * lib/cxx/src/ranch-cxx/dumper/yaml.hh:, * lib/cxx/src/ranch-cxx/dumper/libdumper.hh:, * lib/cxx/src/ranch-cxx/dumper/yaml.cc:, * lib/cxx/src/ranch-cxx/dumper/all.hh:, * lib/cxx/src/ranch-cxx/dumper/libdumper.cc:, * lib/cxx/src/ranch-cxx/dumper/dumper.hh:, * lib/cxx/src/ranch-cxx/input/input.cc:, * lib/cxx/src/ranch-cxx/input/input.hxx:, * lib/cxx/src/ranch-cxx/input/input.hh:, * lib/cxx/src/ranch-cxx/output/output.cc:, * lib/cxx/src/ranch-cxx/output/u-time.cc:, * lib/cxx/src/ranch-cxx/output/output.hxx:, * lib/cxx/src/ranch-cxx/output/all.hh:, * lib/cxx/src/ranch-cxx/output/u-time.hxx:, * lib/cxx/src/ranch-cxx/output/output.hh:, * lib/cxx/src/ranch-cxx/output/u-time.hh:, * lib/cxx/src/ranch-cxx/bencher.hh:, * lib/cxx/src/ranch-cxx/io.hh:, * lib/cxx/src/ranch-cxx/bencher.hxx:, * lib/cxx/src/ranch-cxx/io.hxx:, * lib/cxx/test/bencher-test.htt:, * lib/cxx/demo/basic.cc: Include files are in ranch-cxx/. configure.ac | 9 +++++---- demo/Makefile.am | 2 +- demo/basic.cc | 2 +- src/Makefile.am | 3 +++ src/ranch-cxx/Makefile.am | 22 +++++++++++----------- src/ranch-cxx/bencher.cc | 6 +++--- src/ranch-cxx/bencher.hh | 12 ++++++------ src/ranch-cxx/bencher.hxx | 2 +- src/ranch-cxx/dumper/Makefile.am | 2 +- src/ranch-cxx/dumper/all.hh | 4 ++-- src/ranch-cxx/dumper/dumper.cc | 2 +- src/ranch-cxx/dumper/dumper.hh | 2 +- src/ranch-cxx/dumper/libdumper.cc | 2 +- src/ranch-cxx/dumper/libdumper.hh | 2 +- src/ranch-cxx/dumper/yaml.cc | 4 ++-- src/ranch-cxx/dumper/yaml.hh | 2 +- src/ranch-cxx/input/Makefile.am | 2 +- src/ranch-cxx/input/input.cc | 2 +- src/ranch-cxx/input/input.hh | 4 ++-- src/ranch-cxx/input/input.hxx | 2 +- src/ranch-cxx/inputs.hh | 4 ++-- src/ranch-cxx/inputs.hxx | 2 +- src/ranch-cxx/io.hh | 2 +- src/ranch-cxx/io.hxx | 2 +- src/ranch-cxx/misc/Makefile.am | 3 +-- src/ranch-cxx/misc/yamlize.cc | 2 +- src/ranch-cxx/misc/yamlize.hh | 2 +- src/ranch-cxx/misc/yamlize.hxx | 2 +- src/ranch-cxx/output/Makefile.am | 4 +--- src/ranch-cxx/output/all.hh | 4 ++-- src/ranch-cxx/output/output.cc | 2 +- src/ranch-cxx/output/output.hh | 4 ++-- src/ranch-cxx/output/output.hxx | 2 +- src/ranch-cxx/output/u-time.cc | 2 +- src/ranch-cxx/output/u-time.hh | 4 ++-- src/ranch-cxx/output/u-time.hxx | 2 +- src/ranch-cxx/outputs.hh | 4 ++-- src/ranch-cxx/outputs.hxx | 2 +- src/ranch-cxx/ranch.hh | 8 ++++---- test/Makefile.am | 2 +- test/bencher-test.htt | 4 ++-- 41 files changed, 76 insertions(+), 75 deletions(-) Index: lib/cxx/test/bencher-test.htt --- lib/cxx/test/bencher-test.htt (revision 29) +++ lib/cxx/test/bencher-test.htt (working copy) @@ -2,8 +2,8 @@ #include <cxxtest/TestSuite.h> #include <sstream> -#include <bencher.hh> -#include <dumper/yaml.hh> +#include <ranch-cxx/bencher.hh> +#include <ranch-cxx/dumper/yaml.hh> #define OUTPUT_CTOR_1 \ "- 'test1':\n\ Index: lib/cxx/test/Makefile.am --- lib/cxx/test/Makefile.am (revision 29) +++ lib/cxx/test/Makefile.am (working copy) @@ -9,5 +9,5 @@ MAINTAINERCLEANFILES += $(bencher_test_RUNNER) BUILT_SOURCES += $(bencher_test_RUNNER) EXTRA_DIST += $(bencher_test_RUNNER) -bencher_test_LDADD = $(top_builddir)/src/libranch.la +bencher_test_LDADD = $(top_builddir)/src/ranch-cxx/libranch-cxx.la Index: lib/cxx/configure.ac --- lib/cxx/configure.ac (revision 29) +++ lib/cxx/configure.ac (working copy) @@ -11,10 +11,11 @@ AC_CONFIG_FILES([ Makefile src/Makefile - src/input/Makefile - src/output/Makefile - src/dumper/Makefile - src/misc/Makefile + src/ranch-cxx/Makefile + src/ranch-cxx/input/Makefile + src/ranch-cxx/output/Makefile + src/ranch-cxx/dumper/Makefile + src/ranch-cxx/misc/Makefile test/Makefile demo/Makefile ]) Index: lib/cxx/demo/basic.cc --- lib/cxx/demo/basic.cc (revision 29) +++ lib/cxx/demo/basic.cc (working copy) @@ -1,5 +1,5 @@ -#include "ranch.hh" +#include <ranch-cxx/ranch.hh> int do_something(int i) { Index: lib/cxx/demo/Makefile.am --- lib/cxx/demo/Makefile.am (revision 29) +++ lib/cxx/demo/Makefile.am (working copy) @@ -4,4 +4,4 @@ basic_SOURCES = basic.cc basic_CXXFLAGS = -W -Wall -pedantic -O3 basic_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src -basic_LDADD = $(top_builddir)/src/libranch.la +basic_LDADD = $(top_builddir)/src/ranch-cxx/libranch-cxx.la Index: lib/cxx/src/Makefile.am --- lib/cxx/src/Makefile.am (revision 0) +++ lib/cxx/src/Makefile.am (revision 0) @@ -0,0 +1,3 @@ + +SUBDIRS = ranch-cxx + Index: lib/cxx/src/ranch-cxx/inputs.hh --- lib/cxx/src/ranch-cxx/inputs.hh (revision 29) +++ lib/cxx/src/ranch-cxx/inputs.hh (working copy) @@ -4,7 +4,7 @@ # define RANCH_INPUTS_HH # include <list> -# include <input/input.hh> +# include <ranch-cxx/input/input.hh> namespace Ranch { @@ -32,7 +32,7 @@ } // namespace Ranch -# include <inputs.hxx> +# include <ranch-cxx/inputs.hxx> #endif // !RANCH_INPUTS_HH Index: lib/cxx/src/ranch-cxx/outputs.hh --- lib/cxx/src/ranch-cxx/outputs.hh (revision 29) +++ lib/cxx/src/ranch-cxx/outputs.hh (working copy) @@ -4,7 +4,7 @@ # define RANCH_OUTPUTS_HH # include <list> -# include <output/output.hh> +# include <ranch-cxx/output/output.hh> namespace Ranch { @@ -31,7 +31,7 @@ } // namespace Ranch -# include <outputs.hxx> +# include <ranch-cxx/outputs.hxx> #endif // !RANCH_OUTPUTS_HH Index: lib/cxx/src/ranch-cxx/inputs.hxx --- lib/cxx/src/ranch-cxx/inputs.hxx (revision 29) +++ lib/cxx/src/ranch-cxx/inputs.hxx (working copy) @@ -2,7 +2,7 @@ #ifndef RANCH_INPUTS_HXX # define RANCH_INPUTS_HXX -# include <inputs.hh> +# include <ranch-cxx/inputs.hh> namespace Ranch { Index: lib/cxx/src/ranch-cxx/outputs.hxx --- lib/cxx/src/ranch-cxx/outputs.hxx (revision 29) +++ lib/cxx/src/ranch-cxx/outputs.hxx (working copy) @@ -2,7 +2,7 @@ #ifndef RANCH_OUTPUTS_HXX # define RANCH_OUTPUTS_HXX -# include <outputs.hh> +# include <ranch-cxx/outputs.hh> namespace Ranch { Index: lib/cxx/src/ranch-cxx/ranch.hh --- lib/cxx/src/ranch-cxx/ranch.hh (revision 29) +++ lib/cxx/src/ranch-cxx/ranch.hh (working copy) @@ -2,9 +2,9 @@ #ifndef RANCH_HH # define RANCH_HH -# include <bencher.hh> -# include <input/input.hh> -# include <output/all.hh> -# include <dumper/all.hh> +# include <ranch-cxx/bencher.hh> +# include <ranch-cxx/input/input.hh> +# include <ranch-cxx/output/all.hh> +# include <ranch-cxx/dumper/all.hh> #endif // !RANCH_HH Index: lib/cxx/src/ranch-cxx/bencher.cc --- lib/cxx/src/ranch-cxx/bencher.cc (revision 29) +++ lib/cxx/src/ranch-cxx/bencher.cc (working copy) @@ -1,7 +1,7 @@ -#include <bencher.hh> +#include <ranch-cxx/bencher.hh> #include <cstdarg> -#include <dumper/libdumper.hh> -#include <dumper/dumper.hh> +#include <ranch-cxx/dumper/libdumper.hh> +#include <ranch-cxx/dumper/dumper.hh> namespace Ranch { Index: lib/cxx/src/ranch-cxx/misc/yamlize.hxx --- lib/cxx/src/ranch-cxx/misc/yamlize.hxx (revision 29) +++ lib/cxx/src/ranch-cxx/misc/yamlize.hxx (working copy) @@ -2,7 +2,7 @@ #ifndef RANCH_MISC_YAMLIZE_HXX # define RANCH_MISC_YAMLIZE_HXX -# include <misc/yamlize.hh> +# include <ranch-cxx/misc/yamlize.hh> namespace Ranch { Index: lib/cxx/src/ranch-cxx/misc/yamlize.hh --- lib/cxx/src/ranch-cxx/misc/yamlize.hh (revision 29) +++ lib/cxx/src/ranch-cxx/misc/yamlize.hh (working copy) @@ -27,6 +27,6 @@ } // namespace Misc } // namespace Ranch -# include <misc/yamlize.hxx> +# include <ranch-cxx/misc/yamlize.hxx> #endif // !RANCH_MISC_YAMLIZE_HH Index: lib/cxx/src/ranch-cxx/misc/Makefile.am --- lib/cxx/src/ranch-cxx/misc/Makefile.am (revision 29) +++ lib/cxx/src/ranch-cxx/misc/Makefile.am (working copy) @@ -5,8 +5,7 @@ yamlize.hh \ yamlize.cc \ yamlize.hxx -pkgincludedir = $(includedir)/$(PACKAGE)/misc +pkgincludedir = $(includedir)/ranch-cxx/misc pkginclude_HEADERS = \ yamlize.hh \ yamlize.hxx - Index: lib/cxx/src/ranch-cxx/misc/yamlize.cc --- lib/cxx/src/ranch-cxx/misc/yamlize.cc (revision 29) +++ lib/cxx/src/ranch-cxx/misc/yamlize.cc (working copy) @@ -1,4 +1,4 @@ -#include "misc/yamlize.hh" +#include <ranch-cxx/misc/yamlize.hh> #include <ostream> namespace Ranch Index: lib/cxx/src/ranch-cxx/dumper/dumper.cc --- lib/cxx/src/ranch-cxx/dumper/dumper.cc (revision 29) +++ lib/cxx/src/ranch-cxx/dumper/dumper.cc (working copy) @@ -1,4 +1,4 @@ -#include "dumper/dumper.hh" +#include <ranch-cxx/dumper/dumper.hh> namespace Ranch { Index: lib/cxx/src/ranch-cxx/dumper/yaml.hh --- lib/cxx/src/ranch-cxx/dumper/yaml.hh (revision 29) +++ lib/cxx/src/ranch-cxx/dumper/yaml.hh (working copy) @@ -2,7 +2,7 @@ #ifndef RANCH_YAML_HH # define RANCH_YAML_HH -# include <dumper/dumper.hh> +# include <ranch-cxx/dumper/dumper.hh> namespace Ranch { Index: lib/cxx/src/ranch-cxx/dumper/libdumper.hh --- lib/cxx/src/ranch-cxx/dumper/libdumper.hh (revision 29) +++ lib/cxx/src/ranch-cxx/dumper/libdumper.hh (working copy) @@ -1,7 +1,7 @@ #ifndef RANCH_LIBDUMPER_HH # define RANCH_LIBDUMPER_HH -# include "dumper/fwd.hh" +# include <ranch-cxx/dumper/fwd.hh> namespace Ranch { Index: lib/cxx/src/ranch-cxx/dumper/yaml.cc --- lib/cxx/src/ranch-cxx/dumper/yaml.cc (revision 29) +++ lib/cxx/src/ranch-cxx/dumper/yaml.cc (working copy) @@ -1,5 +1,5 @@ -#include <dumper/yaml.hh> -#include <misc/yamlize.hh> +#include <ranch-cxx/dumper/yaml.hh> +#include <ranch-cxx/misc/yamlize.hh> namespace Ranch { Index: lib/cxx/src/ranch-cxx/dumper/all.hh --- lib/cxx/src/ranch-cxx/dumper/all.hh (revision 29) +++ lib/cxx/src/ranch-cxx/dumper/all.hh (working copy) @@ -1,8 +1,8 @@ #ifndef RANCH_DUMPER_ALL_HH # define RANCH_DUMPER_ALL_HH -# include <dumper/dumper.hh> -# include <dumper/yaml.hh> +# include <ranch-cxx/dumper/dumper.hh> +# include <ranch-cxx/dumper/yaml.hh> #endif // !RANCH_DUMPER_ALL_HH Index: lib/cxx/src/ranch-cxx/dumper/libdumper.cc --- lib/cxx/src/ranch-cxx/dumper/libdumper.cc (revision 29) +++ lib/cxx/src/ranch-cxx/dumper/libdumper.cc (working copy) @@ -1,5 +1,5 @@ #include <iostream> -#include "dumper/yaml.hh" +#include <ranch-cxx/dumper/yaml.hh> namespace Ranch { Index: lib/cxx/src/ranch-cxx/dumper/Makefile.am --- lib/cxx/src/ranch-cxx/dumper/Makefile.am (revision 29) +++ lib/cxx/src/ranch-cxx/dumper/Makefile.am (working copy) @@ -10,7 +10,7 @@ dumper.cc \ yaml.hh \ yaml.cc -pkgincludedir = $(includedir)/$(PACKAGE)/dumper +pkgincludedir = $(includedir)/ranch-cxx/dumper pkginclude_HEADERS = \ all.hh \ fwd.hh \ Index: lib/cxx/src/ranch-cxx/dumper/dumper.hh --- lib/cxx/src/ranch-cxx/dumper/dumper.hh (revision 29) +++ lib/cxx/src/ranch-cxx/dumper/dumper.hh (working copy) @@ -3,7 +3,7 @@ # define RANCH_DUMPER_HH # include <string> -# include <bencher.hh> +# include <ranch-cxx/bencher.hh> namespace Ranch { Index: lib/cxx/src/ranch-cxx/input/input.cc --- lib/cxx/src/ranch-cxx/input/input.cc (revision 29) +++ lib/cxx/src/ranch-cxx/input/input.cc (working copy) @@ -1,4 +1,4 @@ -#include <input/input.hh> +#include <ranch-cxx/input/input.hh> namespace Ranch { Index: lib/cxx/src/ranch-cxx/input/input.hxx --- lib/cxx/src/ranch-cxx/input/input.hxx (revision 29) +++ lib/cxx/src/ranch-cxx/input/input.hxx (working copy) @@ -2,7 +2,7 @@ #ifndef RANCH_INPUT_INPUT_HXX # define RANCH_INPUT_INPUT_HXX -# include <input/input.hh> +# include <ranch-cxx/input/input.hh> # include <ostream> namespace Ranch Index: lib/cxx/src/ranch-cxx/input/Makefile.am --- lib/cxx/src/ranch-cxx/input/Makefile.am (revision 29) +++ lib/cxx/src/ranch-cxx/input/Makefile.am (working copy) @@ -5,7 +5,7 @@ input.hh \ input.hxx \ input.cc -pkgincludedir = $(includedir)/$(PACKAGE)/input +pkgincludedir = $(includedir)/ranch-cxx/input pkginclude_HEADERS = \ input.hh \ input.hxx Index: lib/cxx/src/ranch-cxx/input/input.hh --- lib/cxx/src/ranch-cxx/input/input.hh (revision 29) +++ lib/cxx/src/ranch-cxx/input/input.hh (working copy) @@ -5,7 +5,7 @@ # include <string> # include <iosfwd> -# include <io.hh> +# include <ranch-cxx/io.hh> namespace Ranch { @@ -23,7 +23,7 @@ } // namespace Ranch -# include <input/input.hxx> +# include <ranch-cxx/input/input.hxx> #endif // !RANCH_INPUT_INPUT_HH Index: lib/cxx/src/ranch-cxx/output/output.cc --- lib/cxx/src/ranch-cxx/output/output.cc (revision 29) +++ lib/cxx/src/ranch-cxx/output/output.cc (working copy) @@ -1,4 +1,4 @@ -#include <output/output.hh> +#include <ranch-cxx/output/output.hh> namespace Ranch { Index: lib/cxx/src/ranch-cxx/output/u-time.cc --- lib/cxx/src/ranch-cxx/output/u-time.cc (revision 29) +++ lib/cxx/src/ranch-cxx/output/u-time.cc (working copy) @@ -1,4 +1,4 @@ -#include <output/u-time.hh> +#include <ranch-cxx/output/u-time.hh> #include <sys/times.h> #include <cstdio> #include <cerrno> Index: lib/cxx/src/ranch-cxx/output/output.hxx --- lib/cxx/src/ranch-cxx/output/output.hxx (revision 29) +++ lib/cxx/src/ranch-cxx/output/output.hxx (working copy) @@ -2,7 +2,7 @@ #ifndef RANCH_OUTPUT_OUTPUT_HXX # define RANCH_OUTPUT_OUTPUT_HXX -# include <output/output.hh> +# include <ranch-cxx/output/output.hh> # include <ostream> namespace Ranch Index: lib/cxx/src/ranch-cxx/output/all.hh --- lib/cxx/src/ranch-cxx/output/all.hh (revision 29) +++ lib/cxx/src/ranch-cxx/output/all.hh (working copy) @@ -1,8 +1,8 @@ #ifndef RANCH_OUTPUT_ALL_HH # define RANCH_OUTPUT_ALL_HH -# include "output/output.hh" -# include "output/u-time.hh" +# include <ranch-cxx/output/output.hh> +# include <ranch-cxx/output/u-time.hh> #endif // !RANCH_OUTPUT_ALL_HH Index: lib/cxx/src/ranch-cxx/output/u-time.hxx --- lib/cxx/src/ranch-cxx/output/u-time.hxx (revision 29) +++ lib/cxx/src/ranch-cxx/output/u-time.hxx (working copy) @@ -2,7 +2,7 @@ #ifndef RANCH_OUTPUT_UTIME_HXX # define RANCH_OUTPUT_UTIME_HXX -# include <output/u-time.hh> +# include <ranch-cxx/output/u-time.hh> namespace Ranch { Index: lib/cxx/src/ranch-cxx/output/Makefile.am --- lib/cxx/src/ranch-cxx/output/Makefile.am (revision 29) +++ lib/cxx/src/ranch-cxx/output/Makefile.am (working copy) @@ -9,12 +9,10 @@ u-time.hh \ u-time.hxx \ u-time.cc -pkgincludedir = $(includedir)/$(PACKAGE)/output +pkgincludedir = $(includedir)/ranch-cxx/output pkginclude_HEADERS = \ all.hh \ output.hh \ output.hxx \ u-time.hh \ u-time.hxx - - Index: lib/cxx/src/ranch-cxx/output/output.hh --- lib/cxx/src/ranch-cxx/output/output.hh (revision 29) +++ lib/cxx/src/ranch-cxx/output/output.hh (working copy) @@ -5,7 +5,7 @@ # include <string> # include <iosfwd> -# include <io.hh> +# include <ranch-cxx/io.hh> namespace Ranch { @@ -29,7 +29,7 @@ } // namespace Ranch -# include <output/output.hxx> +# include <ranch-cxx/output/output.hxx> #endif // !RANCH_OUTPUT_OUTPUT_HH Index: lib/cxx/src/ranch-cxx/output/u-time.hh --- lib/cxx/src/ranch-cxx/output/u-time.hh (revision 29) +++ lib/cxx/src/ranch-cxx/output/u-time.hh (working copy) @@ -3,7 +3,7 @@ #ifndef RANCH_OUTPUT_UTIME_HH # define RANCH_OUTPUT_UTIME_HH -# include <output/output.hh> +# include <ranch-cxx/output/output.hh> namespace Ranch { @@ -28,7 +28,7 @@ } // namespace Output } // namespace Ranch -# include <output/u-time.hxx> +# include <ranch-cxx/output/u-time.hxx> #endif // !RANCH_OUTPUT_UTIME_HH Index: lib/cxx/src/ranch-cxx/bencher.hh --- lib/cxx/src/ranch-cxx/bencher.hh (revision 29) +++ lib/cxx/src/ranch-cxx/bencher.hh (working copy) @@ -3,11 +3,11 @@ # define RANCH_BENCH_HH # include <string> -# include <inputs.hh> -# include <input/input.hh> -# include <outputs.hh> -# include <output/output.hh> -# include <dumper/fwd.hh> +# include <ranch-cxx/inputs.hh> +# include <ranch-cxx/input/input.hh> +# include <ranch-cxx/outputs.hh> +# include <ranch-cxx/output/output.hh> +# include <ranch-cxx/dumper/fwd.hh> namespace Ranch { @@ -61,6 +61,6 @@ } // namespace Ranch -# include <bencher.hxx> +# include <ranch-cxx/bencher.hxx> #endif // !RANCH_BENCH_HH Index: lib/cxx/src/ranch-cxx/io.hh --- lib/cxx/src/ranch-cxx/io.hh (revision 29) +++ lib/cxx/src/ranch-cxx/io.hh (working copy) @@ -31,7 +31,7 @@ } // namespace Ranch -# include <io.hxx> +# include <ranch-cxx/io.hxx> #endif // !RANCH_IO_HH Index: lib/cxx/src/ranch-cxx/Makefile.am --- lib/cxx/src/ranch-cxx/Makefile.am (revision 29) +++ lib/cxx/src/ranch-cxx/Makefile.am (working copy) @@ -3,30 +3,30 @@ SUBDIRS = input output dumper misc -lib_LTLIBRARIES = libranch.la -pkginclude_HEADERS = \ - ranch.hh \ +lib_LTLIBRARIES = libranch-cxx.la +libranch_cxx_la_SOURCES = \ bencher.hh \ bencher.hxx \ + bencher.cc \ io.hh \ io.hxx \ inputs.hh \ inputs.hxx \ outputs.hh \ outputs.hxx -libranch_la_SOURCES = \ +libranch_cxx_la_LIBADD = \ + input/libinput.la \ + output/liboutput.la \ + dumper/libdumper.la \ + misc/libmisc.la +pkgincludedir = $(includedir)/ranch-cxx +pkginclude_HEADERS = \ + ranch.hh \ bencher.hh \ bencher.hxx \ - bencher.cc \ io.hh \ io.hxx \ inputs.hh \ inputs.hxx \ outputs.hh \ outputs.hxx -libranch_la_LIBADD = \ - input/libinput.la \ - output/liboutput.la \ - dumper/libdumper.la \ - misc/libmisc.la - Index: lib/cxx/src/ranch-cxx/bencher.hxx --- lib/cxx/src/ranch-cxx/bencher.hxx (revision 29) +++ lib/cxx/src/ranch-cxx/bencher.hxx (working copy) @@ -2,7 +2,7 @@ #ifndef RANCH_BENCHER_HXX # define RANCH_BENCHER_HXX -# include <bencher.hh> +# include <ranch-cxx/bencher.hh> namespace Ranch { Index: lib/cxx/src/ranch-cxx/io.hxx --- lib/cxx/src/ranch-cxx/io.hxx (revision 29) +++ lib/cxx/src/ranch-cxx/io.hxx (working copy) @@ -2,7 +2,7 @@ #ifndef RANCH_IO_HXX # define RANCH_IO_HXX -# include <io.hh> +# include <ranch-cxx/io.hh> # include <ostream> namespace Ranch