aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-02-10 19:13:50 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-02-10 19:13:50 +0000
commit1a49a0058ee71228269b999a37651168d5a4ce83 (patch)
tree8f066b3db793764d07645f3e8e77b1e7f01db26a
parent189d4c6589da3d507e39a9f4a9b7530a97e9b7dc (diff)
downloadpaludis-1a49a0058ee71228269b999a37651168d5a4ce83.tar.gz
paludis-1a49a0058ee71228269b999a37651168d5a4ce83.tar.xz
Move ebuild.cc too
-rw-r--r--paludis/files.m41
-rw-r--r--paludis/repositories/gentoo/Makefile.am22
-rw-r--r--paludis/repositories/gentoo/ebuild.cc (renamed from paludis/ebuild.cc)4
-rw-r--r--paludis/repositories/gentoo/ebuild.hh (renamed from paludis/ebuild.hh)2
-rw-r--r--paludis/repositories/gentoo/ebuild.sr (renamed from paludis/ebuild.sr)0
-rw-r--r--paludis/repositories/gentoo/ebuild_entries.cc2
-rw-r--r--paludis/repositories/gentoo/ebuild_flat_metadata_cache.hh2
-rw-r--r--paludis/repositories/gentoo/vdb_repository.cc2
8 files changed, 26 insertions, 9 deletions
diff --git a/paludis/files.m4 b/paludis/files.m4
index 1efd14b..3500a4e 100644
--- a/paludis/files.m4
+++ b/paludis/files.m4
@@ -15,7 +15,6 @@ add(`dep_atom', `hh', `cc', `test')
add(`dep_atom_flattener', `hh', `cc')
add(`dep_atom_pretty_printer', `hh', `cc')
add(`dep_tag', `hh', `cc', `sr')
-add(`ebuild', `hh', `cc', `sr')
add(`environment', `hh', `cc')
add(`hashed_containers', `hhx', `cc', `test')
add(`host_tuple_name', `hh', `cc', `sr', `test')
diff --git a/paludis/repositories/gentoo/Makefile.am b/paludis/repositories/gentoo/Makefile.am
index 7d8f166..b771e5c 100644
--- a/paludis/repositories/gentoo/Makefile.am
+++ b/paludis/repositories/gentoo/Makefile.am
@@ -4,7 +4,9 @@ DISTCLEANFILES = \
portage_repository-sr.hh portage_repository-sr.cc \
glsa-sr.hh glsa-sr.cc \
portage_repository_params-sr.hh portage_repository_params-sr.cc \
- vdb_repository-sr.hh vdb_repository-sr.cc
+ vdb_repository-sr.hh vdb_repository-sr.cc \
+ ebuild-sr.hh ebuild-sr.cc
+
MAINTAINERCLEANFILES = Makefile.in
AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
@@ -47,6 +49,8 @@ paludis_repositories_gentoo_includedir = $(includedir)/paludis/repositories/gent
libpaludisgentoorepository_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
paludis_repositories_gentoo_include_HEADERS = \
+ ebuild.hh \
+ ebuild-sr.hh \
glsa.hh \
glsa-sr.hh \
portage_repository-sr.hh \
@@ -70,6 +74,7 @@ paludis_repositories_gentoo_include_HEADERS = \
vdb_repository-sr.hh
libpaludisgentoorepository_la_SOURCES = \
+ ebuild.cc \
glsa.cc \
portage_repository.cc \
portage_repository_profile_file.cc \
@@ -134,7 +139,12 @@ endif
portage_repository_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir)
EXTRA_DIST = \
+ ebuild.sr \
+ ebuild-sr.hh \
+ ebuild-sr.cc \
glsa.sr \
+ glsa-sr.hh \
+ glsa-sr.cc \
portage_repository_TEST.cc \
portage_repository_TEST_setup.sh \
portage_repository_TEST_cleanup.sh \
@@ -162,7 +172,9 @@ BUILT_SOURCES = \
glsa-sr.hh \
glsa-sr.cc \
vdb_repository-sr.hh \
- vdb_repository-sr.cc
+ vdb_repository-sr.cc \
+ ebuild-sr.hh \
+ ebuild-sr.cc
check_SCRIPTS = \
portage_repository_TEST_setup.sh portage_repository_TEST_cleanup.sh \
@@ -190,6 +202,12 @@ portage_repository_params-sr.hh : portage_repository_params.sr $(top_srcdir)/mis
portage_repository_params-sr.cc : portage_repository_params.sr $(top_srcdir)/misc/make_sr.bash
$(top_srcdir)/misc/make_sr.bash --source $(srcdir)/portage_repository_params.sr > $@
+ebuild-sr.hh : ebuild.sr $(top_srcdir)/misc/make_sr.bash
+ $(top_srcdir)/misc/make_sr.bash --header $(srcdir)/ebuild.sr > $@
+
+ebuild-sr.cc : ebuild.sr $(top_srcdir)/misc/make_sr.bash
+ $(top_srcdir)/misc/make_sr.bash --source $(srcdir)/ebuild.sr > $@
+
glsa-sr.hh : glsa.sr $(top_srcdir)/misc/make_sr.bash
$(top_srcdir)/misc/make_sr.bash --header $(srcdir)/glsa.sr > $@
diff --git a/paludis/ebuild.cc b/paludis/repositories/gentoo/ebuild.cc
index 92810e4..081eab7 100644
--- a/paludis/ebuild.cc
+++ b/paludis/repositories/gentoo/ebuild.cc
@@ -18,7 +18,7 @@
*/
#include <paludis/about.hh>
-#include <paludis/ebuild.hh>
+#include <paludis/repositories/gentoo/ebuild.hh>
#include <paludis/util/system.hh>
#include <paludis/util/strip.hh>
#include <paludis/util/pstream.hh>
@@ -38,7 +38,7 @@
using namespace paludis;
-#include <paludis/ebuild-sr.cc>
+#include <paludis/repositories/gentoo/ebuild-sr.cc>
EbuildCommand::EbuildCommand(const EbuildCommandParams & p) :
params(p)
diff --git a/paludis/ebuild.hh b/paludis/repositories/gentoo/ebuild.hh
index 5dfff94..93df68e 100644
--- a/paludis/ebuild.hh
+++ b/paludis/repositories/gentoo/ebuild.hh
@@ -58,7 +58,7 @@ namespace paludis
class Environment;
class MakeEnvCommand;
-#include <paludis/ebuild-sr.hh>
+#include <paludis/repositories/gentoo/ebuild-sr.hh>
class EbuildVersionMetadata :
public VersionMetadata,
diff --git a/paludis/ebuild.sr b/paludis/repositories/gentoo/ebuild.sr
index d14d2c1..d14d2c1 100644
--- a/paludis/ebuild.sr
+++ b/paludis/repositories/gentoo/ebuild.sr
diff --git a/paludis/repositories/gentoo/ebuild_entries.cc b/paludis/repositories/gentoo/ebuild_entries.cc
index 122f72b..e0f5934 100644
--- a/paludis/repositories/gentoo/ebuild_entries.cc
+++ b/paludis/repositories/gentoo/ebuild_entries.cc
@@ -20,9 +20,9 @@
#include <paludis/repositories/gentoo/ebuild_entries.hh>
#include <paludis/repositories/gentoo/ebuild_flat_metadata_cache.hh>
#include <paludis/repositories/gentoo/portage_repository.hh>
+#include <paludis/repositories/gentoo/ebuild.hh>
#include <paludis/dep_atom_flattener.hh>
-#include <paludis/ebuild.hh>
#include <paludis/environment.hh>
#include <paludis/portage_dep_parser.hh>
#include <paludis/version_metadata.hh>
diff --git a/paludis/repositories/gentoo/ebuild_flat_metadata_cache.hh b/paludis/repositories/gentoo/ebuild_flat_metadata_cache.hh
index 3310eed..d6e97f9 100644
--- a/paludis/repositories/gentoo/ebuild_flat_metadata_cache.hh
+++ b/paludis/repositories/gentoo/ebuild_flat_metadata_cache.hh
@@ -20,7 +20,7 @@
#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_PORTAGE_EBUILD_FLAT_METADATA_CACHE_HH
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_PORTAGE_EBUILD_FLAT_METADATA_CACHE_HH 1
-#include <paludis/ebuild.hh>
+#include <paludis/repositories/gentoo/ebuild.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/version_metadata.hh>
#include <paludis/repositories/gentoo/eclass_mtimes.hh>
diff --git a/paludis/repositories/gentoo/vdb_repository.cc b/paludis/repositories/gentoo/vdb_repository.cc
index 838d665..bb75238 100644
--- a/paludis/repositories/gentoo/vdb_repository.cc
+++ b/paludis/repositories/gentoo/vdb_repository.cc
@@ -22,7 +22,7 @@
#include <paludis/dep_atom.hh>
#include <paludis/dep_atom_flattener.hh>
-#include <paludis/ebuild.hh>
+#include <paludis/repositories/gentoo/ebuild.hh>
#include <paludis/portage_dep_parser.hh>
#include <paludis/hashed_containers.hh>
#include <paludis/config_file.hh>