aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-04-03 21:22:55 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-04-03 21:22:55 +0000
commitd50b5fbf8868db4c824c9739eeb40773898fe8f1 (patch)
tree3f321cde7b2d968397126fcbc246a819a98f7888
parent0d381dc1e0023da770b9d9c5a1c809fb39756649 (diff)
downloadpaludis-d50b5fbf8868db4c824c9739eeb40773898fe8f1.tar.gz
paludis-d50b5fbf8868db4c824c9739eeb40773898fe8f1.tar.xz
Stop dynamically generating things that don't need to be dynamically generated.
-rw-r--r--configure.ac1
-rw-r--r--paludis/util/Makefile.am.m44
-rw-r--r--paludis/util/attributes.hh (renamed from paludis/util/attributes.hh.in)6
3 files changed, 4 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac
index 6d56c1c..4323695 100644
--- a/configure.ac
+++ b/configure.ac
@@ -944,7 +944,6 @@ AC_OUTPUT(
paludis/syncers/Makefile
paludis/tasks/Makefile
paludis/util/Makefile
- paludis/util/attributes.hh
ruby/Makefile
ruby/demos/Makefile
src/Makefile
diff --git a/paludis/util/Makefile.am.m4 b/paludis/util/Makefile.am.m4
index 85e4a7a..d3065af 100644
--- a/paludis/util/Makefile.am.m4
+++ b/paludis/util/Makefile.am.m4
@@ -34,14 +34,14 @@ include(`paludis/util/files.m4')
CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda
MAINTAINERCLEANFILES = Makefile.in Makefile.am paludis.hh \
- hashed_containers.hh util.hh attributes.hh
+ hashed_containers.hh util.hh
AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_NO_WOLD_STYLE_CAST@ @PALUDIS_CXXFLAGS_VISIBILITY@
DEFS=\
-DSYSCONFDIR=\"$(sysconfdir)\" \
-DLIBEXECDIR=\"$(libexecdir)\"
EXTRA_DIST = util.hh.m4 Makefile.am.m4 files.m4 \
testscriptlist \
- test_extras.cc attributes.hh.in
+ test_extras.cc
SUBDIRS = .
libpaludisutil_la_SOURCES = filelist
diff --git a/paludis/util/attributes.hh.in b/paludis/util/attributes.hh
index 8b2aba2..5613262 100644
--- a/paludis/util/attributes.hh.in
+++ b/paludis/util/attributes.hh
@@ -1,9 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
-@GENERATED_FILE@
-
/*
- * Copyright (c) 2005, 2006 Ciaran McCreesh <ciaranm@ciaranm.org>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaranm@ciaranm.org>
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -75,7 +73,7 @@
# define PALUDIS_ATTRIBUTE(x)
#endif
-#define PALUDIS_ENABLE_VISIBILITY @PALUDIS_ENABLE_VISIBILITY@
+#define PALUDIS_ENABLE_VISIBILITY 0
#if PALUDIS_ENABLE_VISIBILITY
# define PALUDIS_VISIBLE PALUDIS_ATTRIBUTE((visibility("default")))
# define PALUDIS_HIDDEN PALUDIS_ATTRIBUTE((visibility("hidden")))