aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-11-28 13:06:54 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-11-28 13:06:54 +0000
commit7e2b6bec85508b542720039714619e0129e394da (patch)
treeec89d272c15ba4c906eae930e263796f563883b0
parent2b6422996fdd734aae66924c98bf2cb882f966bc (diff)
downloadpaludis-7e2b6bec85508b542720039714619e0129e394da.tar.gz
paludis-7e2b6bec85508b542720039714619e0129e394da.tar.xz
Move things around
-rw-r--r--paludis/environment/default/Makefile.am26
-rw-r--r--paludis/environment/default/default_config.cc4
-rw-r--r--paludis/environment/default/default_config.hh4
-rw-r--r--paludis/environment/default/repository_config_entry.sr (renamed from paludis/repository_config_entry.sr)0
-rw-r--r--paludis/environment/default/use_config_entry.sr (renamed from paludis/use_config_entry.sr)0
-rw-r--r--paludis/files.m45
-rw-r--r--paludis/name.cc2
-rw-r--r--paludis/name.hh2
-rw-r--r--paludis/name.sr (renamed from paludis/qualified_package_name.sr)0
9 files changed, 31 insertions, 12 deletions
diff --git a/paludis/environment/default/Makefile.am b/paludis/environment/default/Makefile.am
index d90b4ab..c599e48 100644
--- a/paludis/environment/default/Makefile.am
+++ b/paludis/environment/default/Makefile.am
@@ -1,4 +1,8 @@
CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda
+DISTCLEANFILES = \
+ use_config_entry-sr.hh use_config_entry-sr.cc \
+ repository_config_entry-sr.hh repository_config_entry-sr.cc
+BUILT_SOURCES = $(DISTCLEANFILES)
MAINTAINERCLEANFILES = Makefile.in
AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
DEFS= \
@@ -18,12 +22,19 @@ libpaludisdefaultenvironment_la_LIBADD = \
lib_LTLIBRARIES = libpaludisdefaultenvironment.la
paludis_environment_default_includedir = $(includedir)/paludis/environment/default
-paludis_environment_default_include_HEADERS = default_config.hh default_environment.hh
+paludis_environment_default_include_HEADERS = \
+ default_config.hh \
+ default_environment.hh \
+ use_config_entry-sr.hh \
+ repository_config_entry-sr.hh
EXTRA_DIST = \
default_environment_TEST_setup.sh \
default_environment_TEST.cc \
- default_environment_TEST_cleanup.sh
+ default_environment_TEST_cleanup.sh \
+ $(BUILT_SOURCES) \
+ use_config_entry.sr \
+ repository_config_entry.sr
TESTS = default_environment_TEST
@@ -48,4 +59,15 @@ default_environment_TEST_LDADD = \
built-sources : $(BUILT_SOURCES)
for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
+use_config_entry-sr.hh : use_config_entry.sr $(top_srcdir)/misc/make_sr.bash
+ $(top_srcdir)/misc/make_sr.bash --header $(srcdir)/use_config_entry.sr > $@
+
+use_config_entry-sr.cc : use_config_entry.sr $(top_srcdir)/misc/make_sr.bash
+ $(top_srcdir)/misc/make_sr.bash --source $(srcdir)/use_config_entry.sr > $@
+
+repository_config_entry-sr.hh : repository_config_entry.sr $(top_srcdir)/misc/make_sr.bash
+ $(top_srcdir)/misc/make_sr.bash --header $(srcdir)/repository_config_entry.sr > $@
+
+repository_config_entry-sr.cc : repository_config_entry.sr $(top_srcdir)/misc/make_sr.bash
+ $(top_srcdir)/misc/make_sr.bash --source $(srcdir)/repository_config_entry.sr > $@
diff --git a/paludis/environment/default/default_config.cc b/paludis/environment/default/default_config.cc
index a605280..5036f0f 100644
--- a/paludis/environment/default/default_config.cc
+++ b/paludis/environment/default/default_config.cc
@@ -48,8 +48,8 @@
using namespace paludis;
-#include <paludis/repository_config_entry-sr.cc>
-#include <paludis/use_config_entry-sr.cc>
+#include <paludis/environment/default/use_config_entry-sr.cc>
+#include <paludis/environment/default/repository_config_entry-sr.cc>
namespace paludis
{
diff --git a/paludis/environment/default/default_config.hh b/paludis/environment/default/default_config.hh
index 49dad4f..bc53fd9 100644
--- a/paludis/environment/default/default_config.hh
+++ b/paludis/environment/default/default_config.hh
@@ -64,8 +64,8 @@ namespace paludis
DefaultConfigError(const std::string & msg) throw ();
};
-#include <paludis/repository_config_entry-sr.hh>
-#include <paludis/use_config_entry-sr.hh>
+#include <paludis/environment/default/use_config_entry-sr.hh>
+#include <paludis/environment/default/repository_config_entry-sr.hh>
/**
* DefaultConfig is used by DefaultEnvironment to access the user's
diff --git a/paludis/repository_config_entry.sr b/paludis/environment/default/repository_config_entry.sr
index fa1f8e8..fa1f8e8 100644
--- a/paludis/repository_config_entry.sr
+++ b/paludis/environment/default/repository_config_entry.sr
diff --git a/paludis/use_config_entry.sr b/paludis/environment/default/use_config_entry.sr
index 76cdbd8..76cdbd8 100644
--- a/paludis/use_config_entry.sr
+++ b/paludis/environment/default/use_config_entry.sr
diff --git a/paludis/files.m4 b/paludis/files.m4
index f912449..068c8df 100644
--- a/paludis/files.m4
+++ b/paludis/files.m4
@@ -21,18 +21,15 @@ add(`environment', `hh', `cc')
add(`hashed_containers', `hhx', `cc', `test')
add(`mask_reasons', `hh', `cc')
add(`match_package', `hh', `cc')
-add(`name', `hh', `cc', `test')
+add(`name', `hh', `cc', `test', `sr')
add(`package_database', `hh', `cc', `test')
add(`package_database_entry', `hh', `sr')
add(`paludis', `hh', `cc')
add(`portage_dep_lexer', `hh', `cc', `test')
add(`portage_dep_parser', `hh', `cc', `test')
-add(`qualified_package_name', `sr')
add(`repository', `hh', `cc', `sr')
-add(`repository_config_entry', `sr')
add(`repository_so_loader', `cc')
add(`syncer', `hh', `cc', `sr')
-add(`use_config_entry', `sr')
add(`version_metadata', `hh', `cc', `sr')
add(`version_operator', `hh', `cc', `test')
add(`version_spec', `hh', `cc', `sr', `test')
diff --git a/paludis/name.cc b/paludis/name.cc
index 2d2736f..a85cb70 100644
--- a/paludis/name.cc
+++ b/paludis/name.cc
@@ -30,7 +30,7 @@
using namespace paludis;
-#include <paludis/qualified_package_name-sr.cc>
+#include <paludis/name-sr.cc>
QualifiedPackageNameError::QualifiedPackageNameError(const std::string & s) throw () :
NameError(s, "qualified package name")
diff --git a/paludis/name.hh b/paludis/name.hh
index 14686e3..873d3c0 100644
--- a/paludis/name.hh
+++ b/paludis/name.hh
@@ -131,7 +131,7 @@ namespace paludis
*/
typedef SortedCollection<CategoryNamePart> CategoryNamePartCollection;
-#include <paludis/qualified_package_name-sr.hh>
+#include <paludis/name-sr.hh>
/**
* Output a QualifiedPackageName to a stream.
diff --git a/paludis/qualified_package_name.sr b/paludis/name.sr
index 4762b55..4762b55 100644
--- a/paludis/qualified_package_name.sr
+++ b/paludis/name.sr