Merge branch 'master' into browser

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

diff --git a/player/Makefile.am b/player/Makefile.am
index ebc4c930dd870823a8f73472757ca06de0bda7d8..f6379d6eaa68e5adf0670de76e58337287643dae 100644 (file)
--- a/player/Makefile.am
+++ b/player/Makefile.am
@@ -13,15 +13,27 @@ bin_PROGRAMS = chimara_iliad
 
 else
 
-dist_pkgdata_DATA = chimara.ui chimara.menus style.css
+dist_pkgdata_DATA = chimara.ui browser.menus player.menus style.css
 bin_PROGRAMS = chimara
 
-chimara_SOURCES = main.c callbacks.c preferences.c preferences.h error.c error.h
+chimara_SOURCES = main.c \
+       preferences.c preferences.h \
+       error.c error.h \
+       player.c player.h \
+       app.c app.h \
+       browser.c browser.h \
+       util.c util.h
 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@
 
 endif
+
+EXTRA_DIST = $(gsettings_SCHEMAS)
+-include $(top_srcdir)/git.mk