git: Line endings of README.txt

[projects/chimara/chimara.git] / player / Makefile.am

diff --git a/player/Makefile.am b/player/Makefile.am
index b548e64df45788a8a6942ffbab3ab15d952fa867..6ef3b76f67f004c9e07d3eae2b44ea227a2b5715 100644 (file)
--- a/player/Makefile.am
+++ b/player/Makefile.am
@@ -3,16 +3,6 @@ AM_CPPFLAGS = -I$(top_srcdir)
 
 PLUGIN_LIBTOOL_FLAGS=-module -avoid-version -export-symbols-regex "^glk_main$$"
 
-if TARGET_ILIAD
-
-chimara_iliad_SOURCES = iliad.c xepdmgrclient.c xepdmgrclient.h
-chimara_iliad_CFLAGS = @TEST_CFLAGS@ $(AM_CFLAGS)
-chimara_iliad_LDADD = @TEST_LIBS@ $(top_builddir)/libchimara/libchimara.la
-
-bin_PROGRAMS = chimara_iliad
-
-else
-
 dist_pkgdata_DATA = chimara.ui chimara.menus style.css
 bin_PROGRAMS = chimara
 
@@ -21,13 +11,18 @@ chimara_CPPFLAGS = $(AM_CPPFLAGS) \
        -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
        -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
        -DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\"
-chimara_CFLAGS = @TEST_CFLAGS@ $(AM_CFLAGS)
-chimara_LDADD = @TEST_LIBS@ $(top_builddir)/libchimara/libchimara.la
+chimara_CFLAGS = @PLAYER_CFLAGS@ $(AM_CFLAGS)
+chimara_LDADD = @PLAYER_LIBS@ $(top_builddir)/libchimara/libchimara.la
+
+gsettings_SCHEMAS = org.chimara-if.gschema.xml
+@GSETTINGS_RULES@
 
-schemasdir = $(datadir)/glib-2.0/schemas
-dist_schemas_DATA = org.chimara-if.gschema.xml
+CLEANFILES = config.pyc
+DISTCLEANFILES = config.py
 
-install-data-hook:
-       glib-compile-schemas $(datadir)/glib-2.0/schemas
+EXTRA_DIST = \
+       $(gsettings_SCHEMAS) \
+       config.py \
+       player.py
 
-endif
+-include $(top_srcdir)/git.mk