This commit is contained in:
Alexander Kojevnikov 2012-08-27 21:40:33 -07:00
parent 9918fec952
commit bcdc33223f
13 changed files with 24 additions and 12 deletions

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
*.a
*.msi
*.o
*.xz

View File

@ -1,5 +1,6 @@
SUBDIRS = \
data \
lib \
man \
po \
src \

View File

@ -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

18
lib/Makefile.am Normal file
View File

@ -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)

View File

@ -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)