Set version to 14 in preparation for next release

[jack_mixer.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 2e2030b0d41382e153c113feb836a6ee1e3f2081..40c5cf42abfa77af7e8bb461505937581b605959 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,48 +17,64 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
-AM_CFLAGS = @JACK_CFLAGS@ -D_GNU_SOURCE -Wall -Werror -fno-strict-aliasing
-INCLUDES = $(PYTHON_INCLUDES)
+AM_CFLAGS = $(JACKMIXER_CFLAGS) -D_GNU_SOURCE -Wall -fno-strict-aliasing
+if DEV_VERSION
+AM_CFLAGS +=  -Werror
+endif
+
+SUBDIRS = data
+
+AM_CPPFLAGS = $(PYTHON_INCLUDES)
 
 jack_mixerdir = $(pkgdatadir)
 pkgpyexecdir = $(pythondir)
-pkgpyexec_LTLIBRARIES = _jack_mixer_c.la
+pkgpyexec_LTLIBRARIES = jack_mixer_c.la
 
-_jack_mixer_c_la_LDFLAGS = -module -avoid-version
+jack_mixer_c_la_LDFLAGS = -module -avoid-version
 
-_jack_mixer_c_la_LIBADD = @JACK_LIBS@
+jack_mixer_c_la_LIBADD = $(JACKMIXER_LIBS)
 
-dist_jack_mixer_DATA = abspeak.py channel.py gui.py meter.py scale.py serialization.py serialization_xml.py slider.py jack_mixer.glade
+jack_mixer_c_la_SOURCES = \
+       jack_mixer.c jack_mixer.h list.h log.h log.c scale.c scale.h jack_compat.h \
+       jack_mixer_c.c
 
-jack_mixer_c.py jack_mixer_wrap.c: $(top_srcdir)/jack_mixer.h
-       swig -o jack_mixer_wrap.c -I$(top_srcdir) -python $(top_srcdir)/jack_mixer.h
+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
 
-pkgpyexec_SCRIPTS = jack_mixer_c.py
+CLEANFILES = *.pyc
+EXTRA_DIST = test.py COPYING jack_mixer.py NEWS
 
-CLEANFILES = jack_mixer_c.py jack_mixer_wrap.c *.pyc
-EXTRA_DIST = test.py gpl.txt jack_mixer.schemas jack_mixer.py jack_mixer_c.py
+bin_SCRIPTS = $(srcdir)/jack_mixer.py
 
-_jack_mixer_c_la_SOURCES = jack_mixer.c jack_mixer.h list.h jack_mixer_wrap.c memory_atomic.c memory_atomic.h log.h log.c
+bin_PROGRAMS = jack_mix_box
 
-bin_SCRIPTS = $(srcdir)/jack_mixer.py
+jack_mixer_c.so: jack_mixer_c.la
+       ln -nfs .libs/jack_mixer_c.so
 
-_jack_mixer_c.so: _jack_mixer_c.la
-       ln -nfs .libs/_jack_mixer_c.so
+jack_mix_box_SOURCES = jack_mix_box.c jack_mixer.c scale.c log.c
+
+jack_mix_box_CFLAGS = $(JACKMIXER_CFLAGS)
+
+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