spek

commit bcdc33223f673ec349639af69fae9604600ab4ce
parent 9918fec952d1d0cfe02257073d4751fea8c730fc
Author: Alexander Kojevnikov <alexander@kojevnikov.com>
Date:   Mon, 27 Aug 2012 21:40:33 -0700

libspek

Diffstat:
M
.gitignore
 | 
1
+
M
Makefile.am
 | 
1
+
M
configure.ac
 | 
2
++
A
lib/Makefile.am
 | 
18
++++++++++++++++++
R
src/spek-audio.c -> lib/spek-audio.c
 | 
0

R
src/spek-audio.h -> lib/spek-audio.h
 | 
0

R
src/spek-fft.c -> lib/spek-fft.c
 | 
0

R
src/spek-fft.h -> lib/spek-fft.h
 | 
0

R
src/spek-palette.c -> lib/spek-palette.c
 | 
0

R
src/spek-palette.h -> lib/spek-palette.h
 | 
0

R
src/spek-pipeline.c -> lib/spek-pipeline.c
 | 
0

R
src/spek-pipeline.h -> lib/spek-pipeline.h
 | 
0

M
src/Makefile.am
 | 
14
++------------

13 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+*.a
 *.msi
 *.o
 *.xz
diff --git a/Makefile.am b/Makefile.am
@@ -1,5 +1,6 @@
 SUBDIRS = \
 	data \
+	lib \
 	man \
 	po \
 	src \
diff --git 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
@@ -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
diff --git a/src/spek-audio.h b/lib/spek-audio.h
diff --git a/src/spek-fft.c b/lib/spek-fft.c
diff --git a/src/spek-fft.h b/lib/spek-fft.h
diff --git a/src/spek-palette.c b/lib/spek-palette.c
diff --git a/src/spek-palette.h b/lib/spek-palette.h
diff --git a/src/spek-pipeline.c b/lib/spek-pipeline.c
diff --git a/src/spek-pipeline.h b/lib/spek-pipeline.h
diff --git 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)