From bcdc33223f673ec349639af69fae9604600ab4ce Mon Sep 17 00:00:00 2001
From: Alexander Kojevnikov <alexander@kojevnikov.com>
Date: Mon, 27 Aug 2012 21:40:33 -0700
Subject: [PATCH] libspek

---
 .gitignore                   |  1 +
 Makefile.am                  |  1 +
 configure.ac                 |  2 ++
 lib/Makefile.am              | 18 ++++++++++++++++++
 {src => lib}/spek-audio.c    |  0
 {src => lib}/spek-audio.h    |  0
 {src => lib}/spek-fft.c      |  0
 {src => lib}/spek-fft.h      |  0
 {src => lib}/spek-palette.c  |  0
 {src => lib}/spek-palette.h  |  0
 {src => lib}/spek-pipeline.c |  0
 {src => lib}/spek-pipeline.h |  0
 src/Makefile.am              | 14 ++------------
 13 files changed, 24 insertions(+), 12 deletions(-)
 create mode 100644 lib/Makefile.am
 rename {src => lib}/spek-audio.c (100%)
 rename {src => lib}/spek-audio.h (100%)
 rename {src => lib}/spek-fft.c (100%)
 rename {src => lib}/spek-fft.h (100%)
 rename {src => lib}/spek-palette.c (100%)
 rename {src => lib}/spek-palette.h (100%)
 rename {src => lib}/spek-pipeline.c (100%)
 rename {src => lib}/spek-pipeline.h (100%)

diff --git a/.gitignore b/.gitignore
index ce2e451..b7bec58 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+*.a
 *.msi
 *.o
 *.xz
diff --git a/Makefile.am b/Makefile.am
index 461de88..9664417 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,6 @@
 SUBDIRS = \
 	data \
+	lib \
 	man \
 	po \
 	src \
diff --git a/configure.ac b/configure.ac
index 6498252..738e6c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,6 +6,7 @@ AM_SILENT_RULES([yes])
 
 AC_PROG_CC_C99
 AC_PROG_CXX
+AC_PROG_RANLIB
 AC_PROG_INSTALL
 IT_PROG_INTLTOOL([0.40.0])
 
@@ -65,6 +66,7 @@ AC_CONFIG_FILES([
 	data/icons/scalable/Makefile
 	dist/osx/spek.modules
 	dist/win/spek.wxs
+	lib/Makefile
 	man/Makefile
 	man/spek.1
 	po/Makefile.in
diff --git a/lib/Makefile.am b/lib/Makefile.am
new file mode 100644
index 0000000..3bc6d53
--- /dev/null
+++ b/lib/Makefile.am
@@ -0,0 +1,18 @@
+noinst_LIBRARIES = libspek.a
+
+libspek_a_SOURCES = \
+	spek-audio.c \
+	spek-audio.h \
+	spek-fft.c \
+	spek-fft.h \
+	spek-palette.c \
+	spek-palette.h \
+	spek-pipeline.c \
+	spek-pipeline.h
+
+libspek_a_CPPFLAGS = \
+	-include config.h \
+	-pthread
+
+libspek_a_CFLAGS = \
+	$(FFMPEG_CFLAGS)
diff --git a/src/spek-audio.c b/lib/spek-audio.c
similarity index 100%
rename from src/spek-audio.c
rename to lib/spek-audio.c
diff --git a/src/spek-audio.h b/lib/spek-audio.h
similarity index 100%
rename from src/spek-audio.h
rename to lib/spek-audio.h
diff --git a/src/spek-fft.c b/lib/spek-fft.c
similarity index 100%
rename from src/spek-fft.c
rename to lib/spek-fft.c
diff --git a/src/spek-fft.h b/lib/spek-fft.h
similarity index 100%
rename from src/spek-fft.h
rename to lib/spek-fft.h
diff --git a/src/spek-palette.c b/lib/spek-palette.c
similarity index 100%
rename from src/spek-palette.c
rename to lib/spek-palette.c
diff --git a/src/spek-palette.h b/lib/spek-palette.h
similarity index 100%
rename from src/spek-palette.h
rename to lib/spek-palette.h
diff --git a/src/spek-pipeline.c b/lib/spek-pipeline.c
similarity index 100%
rename from src/spek-pipeline.c
rename to lib/spek-pipeline.c
diff --git a/src/spek-pipeline.h b/lib/spek-pipeline.h
similarity index 100%
rename from src/spek-pipeline.h
rename to lib/spek-pipeline.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 7ff668d..3c60f12 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,16 +3,8 @@ bin_PROGRAMS = spek
 spek_SOURCES = \
 	spek-audio-desc.cc \
 	spek-audio-desc.hh \
-	spek-audio.c \
-	spek-audio.h \
 	spek-events.cc \
 	spek-events.hh \
-	spek-fft.c \
-	spek-fft.h \
-	spek-palette.c \
-	spek-palette.h \
-	spek-pipeline.c \
-	spek-pipeline.h \
 	spek-platform.cc \
 	spek-platform.hh \
 	spek-preferences-dialog.cc \
@@ -30,16 +22,14 @@ spek_SOURCES = \
 spek_CPPFLAGS = \
 	-include config.h \
 	-pthread \
+	-I$(top_srcdir)/lib \
 	$(WX_CPPFLAGS)
 
-spek_CFLAGS = \
-	$(FFMPEG_CFLAGS) \
-	$(WX_CFLAGS_ONLY)
-
 spek_CXXFLAGS = \
 	$(WX_CXXFLAGS_ONLY)
 
 spek_LDADD = \
+	../lib/libspek.a \
 	$(FFMPEG_LIBS) \
 	$(WX_LIBS)