Set version to 14 in preparation for next release

[jack_mixer.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 14dc8303da4ea92b4f7a10e3341680f0f8b9c801..40c5cf42abfa77af7e8bb461505937581b605959 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,13 +35,24 @@ jack_mixer_c_la_LDFLAGS = -module -avoid-version
 jack_mixer_c_la_LIBADD = $(JACKMIXER_LIBS)
 
 jack_mixer_c_la_SOURCES = \
-       jack_mixer.c jack_mixer.h list.h memory_atomic.c memory_atomic.h log.h log.c scale.c jack_compat.h \
+       jack_mixer.c jack_mixer.h list.h log.h log.c scale.c scale.h jack_compat.h \
        jack_mixer_c.c
 
-dist_jack_mixer_DATA = abspeak.py channel.py gui.py meter.py scale.py serialization.py serialization_xml.py slider.py preferences.py
+dist_jack_mixer_DATA = \
+       abspeak.py \
+       channel.py \
+       gui.py \
+       meter.py \
+       nsmclient.py \
+       preferences.py \
+       scale.py \
+       serialization.py \
+       serialization_xml.py \
+       slider.py \
+       version.py
 
 CLEANFILES = *.pyc
-EXTRA_DIST = test.py COPYING jack_mixer.schemas jack_mixer.py NEWS
+EXTRA_DIST = test.py COPYING jack_mixer.py NEWS
 
 bin_SCRIPTS = $(srcdir)/jack_mixer.py
 
@@ -59,25 +70,11 @@ jack_mix_box_LDADD = $(JACKMIXER_LIBS) -lm
 test: _jack_mixer_c.so
        @./test.py
 
-schemadir = @GCONF_SCHEMA_FILE_DIR@
-schema_DATA = jack_mixer.schemas
-
 install-exec-hook:
        ln -vfs jack_mixer.py $(DESTDIR)$(bindir)/jack_mixer
 
-if GCONF_SCHEMAS_INSTALL
-install-data-hook:
-       GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA)
-
-uninstall-hook:
-       GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-uninstall-rule $(srcdir)/$(schema_DATA)
-       rm -vf $(DESTDIR)$(bindir)/jack_mixer
-endif
-
 pacoinstall:
        test `whoami` == root # test for root
        -paco -rvB jack_mixer
        -paco -lE `pwd` -E /etc -p jack_mixer-`svnversion` "make install"
        -paco -i jack_mixer
-
-