Fix automake warnings, start restructuring folders

Get rid of deprecation warnings INCLUDES -> AM_CPPFLAGS. Closes #4.
Move aclib, libOSC to thirdparty subfolder
Fix typo in libvjmsg/Makefile.am
This commit is contained in:
Patric Schmitz
2015-09-08 21:39:51 +02:00
parent 1385752c5a
commit b065fa7f45
67 changed files with 81 additions and 70 deletions

View File

@@ -1,16 +1,16 @@
# Makefile for veejay
INCLUDES = -I$(top_srcdir) -I$(includedir)\
-I$(top_srcdir)/vjmem\
-I$(top_srcdir)/vjmsg \
-I$(top_srcdir)/libel
AM_CPPFLAGS = -I$(top_srcdir) -I$(includedir)\
-I$(top_srcdir)/vjmem\
-I$(top_srcdir)/vjmsg \
-I$(top_srcdir)/libel
if HAVE_MJPEGTOOLS
INCLUDES +=
AM_CPPFLAGS +=
else
INCLUDES += -I$(top_srcdir)/mjpegtools
AM_CPPFLAGS += -I$(top_srcdir)/mjpegtools
endif
INCLUDES += $(XML2_CFLAGS) $(FFMPEG_CFLAGS) $(MJPEGTOOLS_CFLAGS)
AM_CPPFLAGS += $(XML2_CFLAGS) $(FFMPEG_CFLAGS) $(MJPEGTOOLS_CFLAGS)
SAMPLEREC_LIB_FILE = libsamplerec.la
noinst_LTLIBRARIES = $(SAMPLEREC_LIB_FILE)