aboutsummaryrefslogtreecommitdiff
path: root/paludis/environments/paludis/Makefile.am
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-10-12 22:44:54 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-10-12 22:44:54 +0100
commit178d7a834cb3bc89a9fa51600125e4160ad39f28 (patch)
treed0214243b33458fba534df5424664fff06c1bb1b /paludis/environments/paludis/Makefile.am
parentf6b265538d15fe0d0b3e7906e0a2ffcd98fec4d5 (diff)
downloadpaludis-178d7a834cb3bc89a9fa51600125e4160ad39f28.tar.gz
paludis-178d7a834cb3bc89a9fa51600125e4160ad39f28.tar.xz
Don't load environments from .sos
Diffstat (limited to 'paludis/environments/paludis/Makefile.am')
-rw-r--r--paludis/environments/paludis/Makefile.am26
1 files changed, 3 insertions, 23 deletions
diff --git a/paludis/environments/paludis/Makefile.am b/paludis/environments/paludis/Makefile.am
index 18339409d..a80e63c25 100644
--- a/paludis/environments/paludis/Makefile.am
+++ b/paludis/environments/paludis/Makefile.am
@@ -10,7 +10,7 @@ DEFS= \
-DLIBDIR=\"$(libdir)\" \
-DSHAREDIR=\"$(datarootdir)\"
-libpaludispaludisenvironment_@PALUDIS_PC_SLOT@_la_SOURCES = \
+libpaludispaludisenvironment_la_SOURCES = \
action_to_string.cc action_to_string.hh \
bashable_conf.cc bashable_conf.hh \
keywords_conf.cc keywords_conf.hh \
@@ -26,36 +26,17 @@ libpaludispaludisenvironment_@PALUDIS_PC_SLOT@_la_SOURCES = \
extra_distribution_data.cc extra_distribution_data.hh \
registration.cc
-libpaludispaludisenvironment_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
-
shareenvpaludisdir = $(datarootdir)/paludis/environments/paludis/
dist_shareenvpaludis_DATA = \
default_output.conf \
tests_output.conf
-if ! MONOLITHIC
-
-libpaludispaludisenvironment_@PALUDIS_PC_SLOT@_la_LIBADD = \
- $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la
-
-endif
-
libenvdir = $(libdir)/paludis/environments
-if MONOLITHIC
-
-noinst_LTLIBRARIES = libpaludispaludisenvironment_@PALUDIS_PC_SLOT@.la
-
-else
-
-libenv_LTLIBRARIES = libpaludispaludisenvironment_@PALUDIS_PC_SLOT@.la
-
-endif
+noinst_LTLIBRARIES = libpaludispaludisenvironment.la
-paludis_environment_paludis_includedir = $(includedir)/paludis-$(PALUDIS_PC_SLOT)/paludis/environments/paludis
-paludis_environment_paludis_include_HEADERS = \
+noinst_HEADERS = \
paludis_config.hh \
paludis_environment.hh \
use_conf.hh \
@@ -105,7 +86,6 @@ check_SCRIPTS = paludis_environment_TEST_setup.sh paludis_environment_TEST_clean
paludis_environment_TEST_SOURCES = paludis_environment_TEST.cc
paludis_environment_TEST_LDADD = \
- libpaludispaludisenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/test/libtest.a \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \