summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfred <fred@home.lan>2011-04-23 00:02:01 (GMT)
committer fred <fred@home.lan>2011-04-23 00:02:01 (GMT)
commitd51d9a38aff393ff5caac8793ed2c601a8134379 (patch)
treefee9c641a09e3d6a1a06149b07fe7f8de95c1eda
parent9be6947d00722cabfcb779eca527e25a692f3258 (diff)
parenta556a80a06c3feae92e653f339ac4be978a891b1 (diff)
Merge branch 'master' of git@code.dyne.org:freej.git into sound
-rw-r--r--AUTHORS14
-rw-r--r--Makefile.am2
-rw-r--r--qt/Makefile.am6
3 files changed, 14 insertions, 8 deletions
diff --git a/AUTHORS b/AUTHORS
index c1a4012..915e423 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,4 +1,8 @@
-The FreeJ development team, in order of apparition:
+The FreeJ code development team, in order of apparition:
+
+Fred "fred_99" Cambray
+ = Streaming, A/V Sync, QT GUI
+ = Extensive testing and early library adopter
Filippo "GodoG" Giunchedi http://esaurito.net
= Auto-tools, binary packaging, build daemon
@@ -24,13 +28,13 @@ Christoph "Mr.Goil" Rudorff <goil\\dyne.org>
= Midi, Joystick controllers, scripts, profiling
= Big-Endian port, usability
-Silvano "Kysucix" Galliani - <kysucix\\dyne.org>
+Silvano "Kysucix" Galliani - http://dyne.org/~kysucix
= Javascript interpreter, Video encoding
- = On hold since approx 2006
+ = Juggling video and art experiments
Denis "Jaromil" Roio - http://rastasoft.org
= C++ OO Architecture, Language API
- = Project initiator and current mantainer
+ = Project initiator and mantainer
@@ -80,8 +84,6 @@ Olie Lho <ollie\\sis.com.tw>
Pete Warden
backlight filter
-
-
Fukuchi Kentarou http://effectv.sf.net
filters and code goodies from EffecTV... early inspiration :)
diff --git a/Makefile.am b/Makefile.am
index 4b2f01e..dad7748 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
dist_docs_DATA = README README.OSX TODO INSTALL API COPYING USAGE AUTHORS NEWS KNOWN-BUGS
docsdir = ${prefix}/share/doc/${PACKAGE}
-DISTCHECK_CONFIGURE_FLAGS = --enable-ruby --enable-python
+DISTCHECK_CONFIGURE_FLAGS = --enable-python --enable-qt-gui
#pkgdatadir = ${prefix}/share/freej
diff --git a/qt/Makefile.am b/qt/Makefile.am
index 3a98516..8346c15 100644
--- a/qt/Makefile.am
+++ b/qt/Makefile.am
@@ -15,7 +15,6 @@ moc_%.cpp: %.h
ui_qfreej.h:
uic -o $(top_srcdir)/qt/ui_qfreej.h $(top_srcdir)/qt/ui_qfreej.ui
-
BUILT_SOURCES = ui_qfreej.h \
moc_qfreej.cpp \
moc_QqComboBlit.cpp \
@@ -46,6 +45,11 @@ SOURCES = main.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
+
bin_PROGRAMS = qfreej
qfreej_SOURCES = $(SOURCES)