summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFilippo Giunchedi <filippo@esaurito.net>2009-11-06 18:23:54 (GMT)
committer Filippo Giunchedi <filippo@esaurito.net>2009-11-08 13:04:41 (GMT)
commitecb83bdf865cc87643a16ac79ca2705da74e2180 (patch)
tree313c02e42e577562b4f5195515e1293d6ba7eeb6
parente259aa8e857cc893d0b2b405e6c631a6d3bd6511 (diff)
add src/ncursesgui/ to Makefile.am
-rw-r--r--Makefile.am53
-rw-r--r--configure.ac1
-rw-r--r--src/ncursesgui/Makefile.am29
3 files changed, 52 insertions, 31 deletions
diff --git a/Makefile.am b/Makefile.am
index 7b61bb9..5442a5d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
-SUBDIRS = lib/libmpeg src/ncursesgui
+SUBDIRS = lib/libmpeg src/ncursesgui/libcdk
dist_docs_DATA = README COPYING AUTHORS NEWS KNOWN-BUGS ChangeLog TODO USAGE
docsdir = ${prefix}/share/doc/${PACKAGE}
@@ -144,6 +144,57 @@ noinst_HEADERS += \
EXTRA_DIST += src/gtkgui2/xpm2
+## src/ncursesgui
+noinst_LIBRARIES += src/ncursesgui/librubik.a
+src_ncursesgui_librubik_a_SOURCES = \
+ src/ncursesgui/entry.cpp \
+ src/ncursesgui/fselect.cpp \
+ src/ncursesgui/label.cpp \
+ src/ncursesgui/muse_tui.cpp \
+ src/ncursesgui/play_infobox.cpp \
+ src/ncursesgui/screen.cpp \
+ src/ncursesgui/scroll.cpp \
+ src/ncursesgui/single_channel.cpp \
+ src/ncursesgui/slider.cpp \
+ src/ncursesgui/about.cpp \
+ src/ncursesgui/connectbox.cpp \
+ src/ncursesgui/encsetbox.cpp \
+ src/ncursesgui/streamsetbox.cpp \
+ src/ncursesgui/itemlist.cpp \
+ src/ncursesgui/menu.cpp \
+ src/ncursesgui/ncurses_gui.cpp
+
+src_ncursesgui_librubik_a_CXXFLAGS = \
+ -I$(top_srcdir)/src \
+ -I$(top_srcdir)/src/ncursesgui
+
+noinst_HEADERS += \
+ src/ncursesgui/about.h \
+ src/ncursesgui/connectbox.h \
+ src/ncursesgui/debug.h \
+ src/ncursesgui/encdata.h \
+ src/ncursesgui/encsetbox.h \
+ src/ncursesgui/entry.h \
+ src/ncursesgui/fselect.h \
+ src/ncursesgui/itemlist.h \
+ src/ncursesgui/label.h \
+ src/ncursesgui/menu.h \
+ src/ncursesgui/muse_console.h \
+ src/ncursesgui/muse_tui.h \
+ src/ncursesgui/ncurses_gui.h \
+ src/ncursesgui/play_infobox.h \
+ src/ncursesgui/screen.h \
+ src/ncursesgui/scroll.h \
+ src/ncursesgui/single_channel.h \
+ src/ncursesgui/slider.h \
+ src/ncursesgui/streamsetbox.h
+
+EXTRA_DIST += \
+ src/ncursesgui/coltable.c \
+ src/ncursesgui/muse_console.cpp \
+ src/ncursesgui/testgui.sh
+
+
## doc/
EXTRA_DIST += doc/muse.doxygen.in
if BUILD_DOC
diff --git a/configure.ac b/configure.ac
index f8dcd50..7a93d49 100644
--- a/configure.ac
+++ b/configure.ac
@@ -417,7 +417,6 @@ Makefile
lib/Makefile
lib/libmpeg/Makefile
lib/portaudio/Makefile
-src/ncursesgui/Makefile
src/ncursesgui/libcdk/Makefile
doc/muse.doxygen
])
diff --git a/src/ncursesgui/Makefile.am b/src/ncursesgui/Makefile.am
deleted file mode 100644
index bf3f5cd..0000000
--- a/src/ncursesgui/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-INCLUDES = -I$(top_srcdir)/src -I/sw/include -Ilibcdk
-
-EXTRA_DIST = coltable.c muse_console.cpp testgui.sh
-
-noinst_LIBRARIES = librubik.a
-
-noinst_HEADERS = about.h connectbox.h debug.h encdata.h encsetbox.h entry.h \
-fselect.h itemlist.h label.h menu.h muse_console.h muse_tui.h ncurses_gui.h \
-play_infobox.h screen.h scroll.h single_channel.h slider.h streamsetbox.h
-
-librubik_a_SOURCES = \
- entry.cpp \
- fselect.cpp \
- label.cpp \
- muse_tui.cpp \
- play_infobox.cpp \
- screen.cpp \
- scroll.cpp \
- single_channel.cpp \
- slider.cpp \
- about.cpp \
- connectbox.cpp \
- encsetbox.cpp \
- streamsetbox.cpp \
- itemlist.cpp \
- menu.cpp \
- ncurses_gui.cpp
-
-SUBDIRS = libcdk