aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-04-16 01:20:16 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-04-16 01:20:16 +0000
commit008a0e79ba74135f54b40c0eb7f55f834008e5d5 (patch)
tree96d8a987fe9ded6b2aeec480216756d8262b881c
parent540bf797a866dad1f361d26697141105719272f4 (diff)
downloadpaludis-008a0e79ba74135f54b40c0eb7f55f834008e5d5.tar.gz
paludis-008a0e79ba74135f54b40c0eb7f55f834008e5d5.tar.xz
Install header files and .a libraries
-rw-r--r--paludis/Makefile.am.m47
-rw-r--r--paludis/args/Makefile.am38
-rw-r--r--paludis/util/Makefile.am.m47
3 files changed, 36 insertions, 16 deletions
diff --git a/paludis/Makefile.am.m4 b/paludis/Makefile.am.m4
index 281aea6..ee0e6a3 100644
--- a/paludis/Makefile.am.m4
+++ b/paludis/Makefile.am.m4
@@ -5,6 +5,7 @@ dnl vim: set ft=m4 noet :
define(`filelist', `')dnl
define(`testlist', `')dnl
+define(`headerlist', `')dnl
define(`testscriptlist', `')dnl
define(`addtest', `define(`testlist', testlist `$1_TEST')dnl
$1_TEST_SOURCES = $1_TEST.cc
@@ -15,7 +16,7 @@ $1_TEST_LDADD = $(top_builddir)/paludis/util/test_extras.o \
$1_TEST_CXXFLAGS = -I$(top_srcdir)
')dnl
define(`addtestscript', `define(`testscriptlist', testscriptlist `$1_TEST_setup.sh $1_TEST_cleanup.sh')')dnl
-define(`addhh', `define(`filelist', filelist `$1.hh')')dnl
+define(`addhh', `define(`filelist', filelist `$1.hh')define(`headerlist', headerlist `$1.hh')')dnl
define(`addcc', `define(`filelist', filelist `$1.cc')')dnl
define(`addimpl', `define(`filelist', filelist `$1-impl.hh')')dnl
define(`addthis', `dnl
@@ -53,7 +54,9 @@ TESTS_ENVIRONMENT = env \
check_PROGRAMS = $(TESTS)
check_SCRIPTS = testscriptlist
-noinst_LIBRARIES = libpaludis.a
+lib_LIBRARIES = libpaludis.a
+paludis_includedir = $(includedir)/paludis/
+paludis_include_HEADERS = headerlist
Makefile.am : Makefile.am.m4 files.m4
$(top_srcdir)/misc/do_m4.bash Makefile.am
diff --git a/paludis/args/Makefile.am b/paludis/args/Makefile.am
index 10ed9c1..d2efcc1 100644
--- a/paludis/args/Makefile.am
+++ b/paludis/args/Makefile.am
@@ -5,20 +5,34 @@ AM_CXXFLAGS = -I$(top_srcdir)
TESTS = \
args_TEST
-libpaludisargs_a_SOURCES = \
- args.hh args.cc \
- args_error.hh args_error.cc \
- args_group.hh args_group.cc \
- args_handler.hh args_handler.cc \
- args_option.hh args_option.cc \
- bad_argument.hh bad_argument.cc \
- args_visitor.hh args_visitor.cc \
- bad_value.hh bad_value.cc \
- missing_value.hh missing_value.cc \
- args_dumper.hh args_dumper.cc
+paludis_args_includedir = $(includedir)/paludis/args/
+
+paludis_args_include_HEADERS = \
+ args.hh \
+ args_error.hh \
+ args_group.hh \
+ args_handler.hh \
+ args_option.hh \
+ bad_argument.hh \
+ args_visitor.hh \
+ bad_value.hh \
+ missing_value.hh \
+ args_dumper.hh
+
+libpaludisargs_a_SOURCES = $(paludis_args_include_HEADERS) \
+ args.cc \
+ args_error.cc \
+ args_group.cc \
+ args_handler.cc \
+ args_option.cc \
+ bad_argument.cc \
+ args_visitor.cc \
+ bad_value.cc \
+ missing_value.cc \
+ args_dumper.cc
TESTS_ENVIRONMENT = env -u PALUDIS_OPTIONS TEST_SCRIPT_DIR="$(srcdir)/" $(SHELL) $(top_srcdir)/test/run_test.sh
-noinst_LIBRARIES = libpaludisargs.a
+lib_LIBRARIES = libpaludisargs.a
check_PROGRAMS = $(TESTS)
test_ldadd = \
diff --git a/paludis/util/Makefile.am.m4 b/paludis/util/Makefile.am.m4
index 9400ea9..849f4a9 100644
--- a/paludis/util/Makefile.am.m4
+++ b/paludis/util/Makefile.am.m4
@@ -4,6 +4,7 @@ ifdef(`__gnu__',`',`errprint(`This is not GNU m4...
dnl vim: set ft=m4 noet :
define(`filelist', `')dnl
+define(`headerlist', `')dnl
define(`testlist', `')dnl
define(`testscriptlist', `')dnl
define(`addtest', `define(`testlist', testlist `$1_TEST')dnl
@@ -12,7 +13,7 @@ $1_TEST_LDADD = test_extras.o $(top_builddir)/test/libtest.a libpaludisutil.a
$1_TEST_CXXFLAGS = -I$(top_srcdir)
')dnl
define(`addtestscript', `define(`testscriptlist', testscriptlist `$1_TEST_setup.sh $1_TEST_cleanup.sh')')dnl
-define(`addhh', `define(`filelist', filelist `$1.hh')')dnl
+define(`addhh', `define(`filelist', filelist `$1.hh')define(`headerlist', headerlist `$1.hh')')dnl
define(`addcc', `define(`filelist', filelist `$1.cc')')dnl
define(`addimpl', `define(`filelist', filelist `$1-impl.hh')')dnl
define(`addthis', `dnl
@@ -46,7 +47,9 @@ TESTS_ENVIRONMENT = env \
check_PROGRAMS = $(TESTS)
check_SCRIPTS = testscriptlist
-noinst_LIBRARIES = libpaludisutil.a
+lib_LIBRARIES = libpaludisutil.a
+paludis_util_includedir = $(includedir)/paludis/util/
+paludis_util_include_HEADERS = headerlist
Makefile.am : Makefile.am.m4 files.m4
$(top_srcdir)/misc/do_m4.bash Makefile.am