summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaromil <jaromil@dyne.org>2011-05-26 22:57:27 (GMT)
committer Jaromil <jaromil@dyne.org>2011-05-26 22:57:27 (GMT)
commitadd8360d9e3846110cfa7ecab34426b4efaef223 (patch)
treeb7ebc9214e16abea7de757efa9bb5f2d306afb71
parent3bcee45bb8c1f35be7c041a3e31caefccbbb235e (diff)
fixes for make distcheck
-rw-r--r--Makefile.am4
-rw-r--r--configure.ac5
-rw-r--r--qt/Makefile.am4
3 files changed, 5 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am
index dad7748..006caa5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,8 +8,8 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-python --enable-qt-gui
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = freej.pc
-SUBDIRS = lib src doc bindings scripts tests $(EXTRA_DIRS)
+SUBDIRS = lib src qt doc bindings scripts tests
ACLOCAL_AMFLAGS = -I m4
-EXTRA_DIST = autogen.sh freej.spec xcode
+EXTRA_DIST = freej.spec xcode
diff --git a/configure.ac b/configure.ac
index 8a5a7ca..617aba6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ dnl ==============================================================
dnl require autoconf 2.62 (AS_ECHO/AS_ECHO_N)
AC_PREREQ([2.62])
-AC_INIT([FreeJ],[0.11.0],[freej@lists.dyne.org],[freej])
+AC_INIT([FreeJ],[0.12.0],[freej@lists.dyne.org],[freej])
AC_CONFIG_MACRO_DIR([m4])
AC_CANONICAL_HOST
@@ -959,9 +959,6 @@ AC_SUBST(CFLAGS)
CXXFLAGS="$GLOBAL_CFLAGS $CXXFLAGS"
AC_SUBST(CXXFLAGS)
-EXTRA_DIRS="$QTGUI_DIRS"
-AC_SUBST([EXTRA_DIRS])
-
dnl ==============================================================
dnl freej specific flags, explanation:
dnl STATIC_CFLAGS cflags regarding static libraries from lib/
diff --git a/qt/Makefile.am b/qt/Makefile.am
index bc46713..7252025 100644
--- a/qt/Makefile.am
+++ b/qt/Makefile.am
@@ -42,13 +42,13 @@ SOURCES = main.cpp \
qOpacity.cpp \
qEncoder.cpp \
qLogging.cpp \
- qqcombores.cpp \
+ qqcombores.cpp \
$(BUILT_SOURCES)
noinst_HEADERS = FakeWindow.h qJackClient.h QqComboBlit.h QqLinkList.h \
specialeventget.h qEncoder.h qLogging.h \
QqComboFilter.h QqTabWidget.h qfreej.h qOpacity.h \
- QqFiltersApplied.h QqWidget.h
+ QqFiltersApplied.h QqWidget.h qqcombores.h
bin_PROGRAMS = qfreej