Don't install test plugins

Install player data files in player package
Don't build player in both player and tests directories

diff --git a/chimara.spec.in b/chimara.spec.in
index 9f0712aaedc68d64b51436fbdd271286f968f26c..951f7d3f5fa71b8a921a077a03d2a833c82854ea 100644 (file)
--- a/chimara.spec.in
+++ b/chimara.spec.in
@@ -85,8 +85,6 @@ fi
 %doc %{_infodir}/*.info*
 %{_libdir}/libchimara.so.*
 %{_libdir}/chimara/*.so
-%{_datadir}/*.ui
-%{_datadir}/*.menus
 
 %files devel
 %defattr(-,root,root,-)
@@ -103,11 +101,14 @@ fi
 %doc %{_datadir}/doc/chimara/ChangeLog 
 %doc %{_datadir}/doc/chimara/NEWS
 %{_bindir}/chimara
+%{_pkgdatadir}/chimara.ui
+%{_pkgdatadir}/chimara.menus
 
 %changelog
 * Fri Dec 4 2009 P. F. Chimento <philip.chimento@gmail.com>
 - 0.1-1
 - Mended rpmlint warnings and errors.
+- Moved player data files to player package.
 * Mon Nov 30 2009 W. M. van Vliet <w.m.vanvliet@student.utwente.nl>
 - Added Chimara player to the package.
 * Wed Nov 25 2009 P. F. Chimento <philip.chimento@gmail.com>

diff --git a/debian/libchimara-player.install b/debian/libchimara-player.install
index 0e4f65ae8f26ce6cb1fe9cbde5ca7a1b1ef4bce6..1a09ec852a2f2b77bc063bc336cc8006d514ac69 100644 (file)
--- a/debian/libchimara-player.install
+++ b/debian/libchimara-player.install
@@ -1 +1,3 @@
 debian/tmp/usr/bin/chimara
+debian/tmp/usr/share/chimara/chimara.ui
+debian/tmp/usr/share/chimara/chimara.menus
\ No newline at end of file

diff --git a/player/Makefile.am b/player/Makefile.am
index af25af53e27bfa62d3545deb7494f7209b4721d2..fab834162253b94b0196d654b00a2d729a0ce407 100644 (file)
--- a/player/Makefile.am
+++ b/player/Makefile.am
@@ -13,14 +13,14 @@ bin_PROGRAMS = chimara_iliad
 
 else
 
-dist_data_DATA = chimara.ui chimara.menus 
+dist_pkgdata_DATA = chimara.ui chimara.menus 
 bin_PROGRAMS = chimara
 
 chimara_SOURCES = main.c callbacks.c error.c error.h
 chimara_CPPFLAGS = $(AM_CPPFLAGS) \
        -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
        -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
-       -DPACKAGE_DATA_DIR=\""$(datadir)"\"
+       -DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\"
 chimara_CFLAGS = @TEST_CFLAGS@ $(AM_CFLAGS)
 chimara_LDADD = @TEST_LIBS@ $(top_builddir)/libchimara/libchimara.la
 

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 18494375d480c7905aa70d98aa1926ff0ebc3663..b915c48fd2ed2dce2b0a1b37990fb7790bbf4561 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,28 +1,16 @@
 AM_CFLAGS = -Wall
 AM_CPPFLAGS = -I$(top_srcdir)
 
-PLUGIN_LIBTOOL_FLAGS=-module -avoid-version -export-symbols-regex "^glk_main$$"
+# The rpath is necessary because stoopid libtool won't build a shared library
+# if it's noinst_, because what POSSIBLE reason could you have to do that?
+TEST_PLUGIN_LIBTOOL_FLAGS = \
+       -module \
+       -shared \
+       -avoid-version \
+       -export-symbols-regex "^glk_main$$" \
+       -rpath $(abs_builddir)
 
-if TARGET_ILIAD
-
-iliad_SOURCES = iliad.c
-iliad_CFLAGS = @TEST_CFLAGS@ $(AM_CFLAGS)
-iliad_LDADD = @TEST_LIBS@ $(top_builddir)/libchimara/libchimara.la
-
-noinst_PROGRAMS = iliad
-
-else
-
-dist_data_DATA = chimara.ui chimara.menus glulxercise.ui
-noinst_PROGRAMS = test-chimara test-multisession glulxercise plugin-loader
-
-test_chimara_SOURCES = main.c callbacks.c error.c error.h
-test_chimara_CPPFLAGS = $(AM_CPPFLAGS) \
-       -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-       -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
-       -DPACKAGE_DATA_DIR=\""$(datadir)"\"
-test_chimara_CFLAGS = @TEST_CFLAGS@ $(AM_CFLAGS)
-test_chimara_LDADD = @TEST_LIBS@ $(top_builddir)/libchimara/libchimara.la
+noinst_PROGRAMS = test-multisession glulxercise plugin-loader
 
 test_multisession_SOURCES = test-multisession.c
 test_multisession_CFLAGS = @TEST_CFLAGS@ $(AM_CFLAGS)
@@ -37,24 +25,22 @@ plugin_loader_SOURCES = plugin-loader.c
 plugin_loader_CFLAGS = @TEST_CFLAGS@ $(AM_CFLAGS)
 plugin_loader_LDADD = @TEST_LIBS@ $(top_builddir)/libchimara/libchimara.la
 
-pkglib_LTLIBRARIES = first.la model.la gridtest.la splittest.la multiwin.la styletest.la
+noinst_LTLIBRARIES = first.la model.la gridtest.la splittest.la multiwin.la styletest.la
 
 first_la_SOURCES = first.c
-first_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
+first_la_LDFLAGS = $(TEST_PLUGIN_LIBTOOL_FLAGS)
 
 model_la_SOURCES = model.c
-model_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
+model_la_LDFLAGS = $(TEST_PLUGIN_LIBTOOL_FLAGS)
 
 gridtest_la_SOURCES = gridtest.c
-gridtest_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
+gridtest_la_LDFLAGS = $(TEST_PLUGIN_LIBTOOL_FLAGS)
 
 splittest_la_SOURCES = splittest.c
-splittest_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
+splittest_la_LDFLAGS = $(TEST_PLUGIN_LIBTOOL_FLAGS)
 
 multiwin_la_SOURCES = multiwin.c
-multiwin_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
+multiwin_la_LDFLAGS = $(TEST_PLUGIN_LIBTOOL_FLAGS)
 
 styletest_la_SOURCES = styletest.c
-styletest_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
-
-endif
+styletest_la_LDFLAGS = $(TEST_PLUGIN_LIBTOOL_FLAGS)