X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=player%2FMakefile.am;h=6ef3b76f67f004c9e07d3eae2b44ea227a2b5715;hb=HEAD;hp=af25af53e27bfa62d3545deb7494f7209b4721d2;hpb=71bb42dc75907bd2acf2706ecec69acf57177221;p=projects%2Fchimara%2Fchimara.git

diff --git a/player/Makefile.am b/player/Makefile.am
index af25af5..6ef3b76 100644
--- a/player/Makefile.am
+++ b/player/Makefile.am
@@ -3,25 +3,26 @@ AM_CPPFLAGS = -I$(top_srcdir)
 
 PLUGIN_LIBTOOL_FLAGS=-module -avoid-version -export-symbols-regex "^glk_main$$"
 
-if TARGET_ILIAD
-
-chimara_iliad_SOURCES = iliad.c
-chimara_iliad_CFLAGS = @TEST_CFLAGS@ $(AM_CFLAGS)
-chimara_iliad_LDADD = @TEST_LIBS@ $(top_builddir)/libchimara/libchimara.la
-
-bin_PROGRAMS = chimara_iliad
-
-else
-
-dist_data_DATA = chimara.ui chimara.menus 
+dist_pkgdata_DATA = chimara.ui chimara.menus style.css
 bin_PROGRAMS = chimara
 
-chimara_SOURCES = main.c callbacks.c error.c error.h
+chimara_SOURCES = main.c callbacks.c preferences.c preferences.h error.c error.h
 chimara_CPPFLAGS = $(AM_CPPFLAGS) \
 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
 	-DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
-	-DPACKAGE_DATA_DIR=\""$(datadir)"\"
-chimara_CFLAGS = @TEST_CFLAGS@ $(AM_CFLAGS)
-chimara_LDADD = @TEST_LIBS@ $(top_builddir)/libchimara/libchimara.la
+	-DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\"
+chimara_CFLAGS = @PLAYER_CFLAGS@ $(AM_CFLAGS)
+chimara_LDADD = @PLAYER_LIBS@ $(top_builddir)/libchimara/libchimara.la
+
+gsettings_SCHEMAS = org.chimara-if.gschema.xml
+@GSETTINGS_RULES@
+
+CLEANFILES = config.pyc
+DISTCLEANFILES = config.py
+
+EXTRA_DIST = \
+	$(gsettings_SCHEMAS) \
+	config.py \
+	player.py
 
-endif
+-include $(top_srcdir)/git.mk