diff options
| author | Roger Leigh <rleigh@debian.org> | 2013-04-03 23:07:43 +0100 |
|---|---|---|
| committer | Roger Leigh <rleigh@debian.org> | 2013-04-03 23:07:43 +0100 |
| commit | 68a809b92deb3a805674546c631003bdb9a81867 (patch) | |
| tree | 38a13cdcf9aac8e1446dbf44ee53dea43101a13b /bin/schroot | |
| parent | fef21ee5fc82751b898d91bcddcf318ba9241452 (diff) | |
| download | schroot-68a809b92deb3a805674546c631003bdb9a81867.tar.gz | |
lib: Move libschroot to schroot-common (2)
Diffstat (limited to 'bin/schroot')
| -rw-r--r-- | bin/schroot/Makefile.am | 14 | ||||
| -rw-r--r-- | bin/schroot/options.h | 4 | ||||
| -rw-r--r-- | bin/schroot/schroot.cc | 4 |
3 files changed, 5 insertions, 17 deletions
diff --git a/bin/schroot/Makefile.am b/bin/schroot/Makefile.am index e675220a..36d3675a 100644 --- a/bin/schroot/Makefile.am +++ b/bin/schroot/Makefile.am @@ -16,25 +16,13 @@ # ##################################################################### -noinst_LTLIBRARIES += \ - bin/schroot/libschroot.la - bin_PROGRAMS += bin/schroot/schroot -bin_schroot_libschroot_la_SOURCES = \ - bin/schroot/options-base.h \ - bin/schroot/options-base.cc \ - bin/schroot/main-base.h \ - bin/schroot/main-base.cc \ - bin/schroot/main.h \ - bin/schroot/main.cc -bin_schroot_libschroot_la_LIBADD = $(top_builddir)/lib/bin-common/libbin-common.la - bin_schroot_schroot_SOURCES = \ bin/schroot/schroot.cc \ bin/schroot/options.h \ bin/schroot/options.cc -bin_schroot_schroot_LDADD = bin/schroot/libschroot.la +bin_schroot_schroot_LDADD = $(top_builddir)/lib/schroot-common/libschroot-common.la install-exec-hook:: # Install setuid root. diff --git a/bin/schroot/options.h b/bin/schroot/options.h index 20522759..d6a4efe5 100644 --- a/bin/schroot/options.h +++ b/bin/schroot/options.h @@ -19,7 +19,7 @@ #ifndef SCHROOT_OPTIONS_H #define SCHROOT_OPTIONS_H -#include <schroot/options-base.h> +#include <schroot-common/options-base.h> namespace schroot { @@ -27,7 +27,7 @@ namespace schroot /** * schroot command-line options. */ - class options : public options_base + class options : public schroot_common::options_base { public: /// The constructor. diff --git a/bin/schroot/schroot.cc b/bin/schroot/schroot.cc index f62341df..b4d1960b 100644 --- a/bin/schroot/schroot.cc +++ b/bin/schroot/schroot.cc @@ -18,7 +18,7 @@ #include <config.h> -#include "main.h" +#include <schroot-common/main.h> #include "options.h" #include <bin-common/run.h> @@ -40,5 +40,5 @@ int main (int argc, char *argv[]) { - return bin_common::run<schroot::options, schroot::main>(argc, argv); + return bin_common::run<schroot::options, schroot_common::main>(argc, argv); } |