Commit 4eddc46a by Diego Elio Pettenò

build: replace old automake-based build with a non-recursive Makefile.am.

This new buildsystem is non-recursive (so it uses higher parallel
build), but also drops libdvdnavmini (which is just an alias for
libdvdnav itself), and a few more useless sophistications.
parent 09564f5b
include $(top_srcdir)/misc/Makefile.common
if DVDNAV_ENABLE_EXAMPLES
EXAMPLES_DIR = examples
else
EXAMPLES_DIR =
endif
SUBDIRS = src $(EXAMPLES_DIR) doc misc m4
AM_CPPFLAGS = $(THREAD_CFLAGS) $(DVDREAD_CFLAGS) -I$(top_srcdir)/src
EXTRA_DIST = autogen.sh \
AUTHORS \
ChangeLog \
configure \
config.guess \
config.sub \
COPYING \
INSTALL \
install-sh \
libtool \
ltmain.sh \
missing \
mkinstalldirs \
README \
TODO
TODO \
msvc/ \
src/README.MAP \
src/FELLOWSHIP.map \
docs/doxy.conf \
docs/mainpage.cpp \
docs/tutorial.cpp \
docs/dvd_structures \
docs/library_layout
lib_LTLIBRARIES = libdvdnav.la
libdvdnav_la_SOURCES = \
src/dvdnav.c \
src/read_cache.c \
src/navigation.c \
src/highlight.c \
src/searching.c \
src/settings.c \
src/remap.c \
src/dvdnav_internal.h \
src/read_cache.h \
src/remap.h \
src/vm/decoder.c \
src/vm/decoder.h \
src/vm/vm.c \
src/vm/vm.h \
src/vm/vmcmd.c \
src/vm/vmcmd.h
libdvdnav_la_LDFLAGS = \
-version-info $(DVDNAV_LT_CURRENT):$(DVDNAV_LT_REVISION):$(DVDNAV_LT_AGE) \
-export-symbols-regex "(^dvdnav.*|^nav.*|^ifo.*|^DVD.*)"
libdvdnav_la_LIBADD = $(THREAD_LIBS) $(DVDREAD_LIBS)
pkgincludedir = $(includedir)/dvdnav
pkginclude_HEADERS = \
src/dvdnav/dvdnav.h \
src/dvdnav/dvdnav_events.h \
src/dvdnav/dvd_types.h
MOSTLYCLEANFILES += $(PACKAGE)_$(VERSION).tar.gz \
$(distdir).tar.gz $(PACKAGE).tgz package_descriptions
bin_SCRIPTS = misc/dvdnav-config
MAINTAINERCLEANFILES += configure $(ACLOCAL_M4) config.h.in \
ltmain.sh config.guess config.sub install-sh missing \
mkinstalldirs
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = misc/dvdnav.pc misc/dvdnavmini.pc
world:
@$(MAKE) clean all install 2> warnings.log
test -s warnings.log || rm warnings.log
m4datadir = $(datadir)/aclocal
m4data_DATA = m4/dvdnav.m4
prune-cache:
-rm -f config.cache
EXTRA_PROGRAMS = menus
release-check:
@./config.status misc/relchk.sh
@./autogen.sh noconfig && $(SHELL) misc/relchk.sh
menus_SOURCES = examples/menus.c
menus_CPPFLAGS = $(AM_CPPFLAGS) -DDVDNAV_COMPILE
menus_LDADD = libdvdnav.la
dist-hook:
cp -r $(srcdir)/msvc $(distdir)/msvc
rm -rf `find $(distdir)/msvc -name CVS`
docs: misc/doxy.conf
@if test x"$(DOXYGEN)" != "xno"; then \
cd misc && $(DOXYGEN) doxy.conf > /dev/null 2> /dev/null; \
fi
......@@ -169,13 +169,6 @@ case $host in
esac
dnl ---------------------------------------------
dnl option for examples
dnl ---------------------------------------------
AC_ARG_ENABLE([examples], [ --disable-examples disable examples],
[ enable_examples=$enableval ], [ enable_examples=yes ] )
AM_CONDITIONAL(DVDNAV_ENABLE_EXAMPLES, [test "x${enable_examples}" != xno])
dnl ---------------------------------------------
dnl libdvdread
dnl ---------------------------------------------
AC_ARG_WITH([dvdread-config],
......@@ -220,25 +213,12 @@ dnl ---------------------------------------------
AC_CHECK_PROG(DOXYGEN, doxygen, doxygen, no)
dnl ---------------------------------------------
dnl Some include paths ( !!! DO NOT REMOVE !!! )
dnl ---------------------------------------------
INCLUDES='-I$(top_srcdir) $(DVDNAV_CFLAGS)'
AC_SUBST(INCLUDES)
dnl ---------------------------------------------
dnl Output configuration files
dnl ---------------------------------------------
AC_OUTPUT([
Makefile
src/Makefile
src/vm/Makefile
misc/Makefile
misc/dvdnav-config
misc/dvdnav.pc
misc/dvdnavmini.pc
misc/libdvdnav.spec
misc/relchk.sh
m4/Makefile
doc/Makefile
examples/Makefile
])
include $(top_srcdir)/misc/Makefile.common
EXTRA_DIST = doxy.conf mainpage.cpp tutorial.cpp dvd_structures library_layout
docs: doxy.conf
@if test x"$(DOXYGEN)" != "xno"; then \
$(DOXYGEN) doxy.conf > /dev/null 2> /dev/null; \
fi
include $(top_srcdir)/misc/Makefile.common
AM_CPPFLAGS = -DDVDNAV_COMPILE $(DVDREAD_CFLAGS) -I$(top_srcdir)/src
DVDNAV_LIB = $(top_builddir)/src/libdvdnav.la
noinst_PROGRAMS = menus
menus_SOURCES = menus.c
menus_LDADD = $(DVDNAV_LIB) $(DVDREAD_LIBS)
$(DVDNAV_LIB):
@cd $(top_builddir)/src/ && $(MAKE) libdvdnav.la
include $(top_srcdir)/misc/Makefile.common
EXTRA_DIST = dvdnav.m4
m4datadir = $(datadir)/aclocal
m4data_DATA = dvdnav.m4
include $(top_srcdir)/misc/Makefile.common
EXTRA_DIST = dvdnav-config.in libdvdnav.spec.in libdvdnav.spec Makefile.common relchk.sh relchk.sh.in
bin_SCRIPTS = dvdnav-config
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = dvdnav.pc dvdnavmini.pc
prefix=/usr/local
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
includedir=${prefix}/include
Name: libdvdnavmini
Description: DVD Navigation mini library
Version: 4.2.0
Requires: dvdnav
......@@ -7,5 +7,4 @@ Name: libdvdnavmini
Description: DVD Navigation mini library
Version: @VERSION@
Cflags: -I${includedir} @DVDREAD_CFLAGS@ @THREAD_CFLAGS@
Libs: -L${libdir} -ldvdnav @THREAD_LIBS@
Requires: dvdnav
#!/bin/sh
##
## A simple compare directory content utility.
##
topdir="`pwd`"
distdir="@PACKAGE_NAME@-@PACKAGE_VERSION@"
log="$topdir/dist-log"
logerror="$topdir/dist-errors"
getdir() {
if test -r .relignore; then
filelist=`ls | grep -Fxvf .relignore`
else
filelist=`ls`
fi
for file in $filelist; do
if test -d $file -a $file != "CVS" -a $file != $distdir; then
(cd $file && getdir) || (cd ..)
else
if test ! -d $file -a \
$file != $log -a \
$file != $logerror -a \
$file != "$distdir.tar.gz"; then
orifile=`pwd`/$file
distfile=$topdir/$distdir${orifile##*$topdir}
echo -e "check:\t$orifile\nand\t$distfile" >> $log
if test ! -e $distfile; then
missingfile=${orifile##$topdir}
echo "${missingfile#/} is missing in tarball" >> $logerror
fi
fi
fi
done
}
main() {
rm -f $log $logerror
make config.status && make dist && mv $distdir.tar.gz $distdir.tmp.tar.gz && \
cp config.status config.tmp.status && make clean && make distclean && \
mv $distdir.tmp.tar.gz $distdir.tar.gz && mv config.tmp.status config.status && \
tar -xzf $distdir.tar.gz
echo "Check is running, be patient..."
getdir
rm -rf $distdir
rm -f $distdir.tar.gz
./config.status --recheck
./config.status
echo " * Log is ${log##*/}"
echo " * Error log is ${logerror##*/}"
}
main
include $(top_srcdir)/misc/Makefile.common
SUBDIRS = vm
includedir = ${prefix}/include/dvdnav
AM_CPPFLAGS = $(THREAD_CFLAGS) $(DVDREAD_CFLAGS) \
-I$(top_srcdir)/src/vm
EXTRA_DIST = README.MAP FELLOWSHIP.map
lib_LTLIBRARIES = libdvdnav.la libdvdnavmini.la
libdvdnav_la_SOURCES = dvdnav.c \
read_cache.c navigation.c highlight.c \
searching.c settings.c remap.c \
dvdnav_internal.h read_cache.h remap.h
libdvdnav_la_LIBADD = $(THREAD_LIBS) $(DVDREAD_LIBS) \
$(top_builddir)/src/vm/libdvdvm.la
libdvdnav_la_LDFLAGS = \
-version-info $(DVDNAV_LT_CURRENT):$(DVDNAV_LT_REVISION):$(DVDNAV_LT_AGE) \
-export-symbols-regex "(^dvdnav.*|^nav.*|^ifo.*|^DVD.*)"
# -release $(DVDNAV_MAJOR).$(DVDNAV_MINOR).$(DVDNAV_SUB)
libdvdnavmini_la_SOURCES = $(libdvdnav_la_SOURCES)
libdvdnavmini_la_LIBADD = $(THREAD_LIBS) \
$(top_builddir)/src/vm/libdvdvm.la \
-ldvdread
libdvdnavmini_la_LDFLAGS = $(libdvdnav_la_LDFLAGS)
include_HEADERS = dvdnav/dvdnav.h dvdnav/dvdnav_events.h dvdnav/dvd_types.h
include $(top_srcdir)/misc/Makefile.common
includedir = ${prefix}/include/dvdnav
AM_CPPFLAGS = -DDVDNAV_COMPILE $(THREAD_CFLAGS) $(DVDREAD_CFLAGS) \
-I$(top_srcdir)/src
noinst_LTLIBRARIES = libdvdvm.la
libdvdvm_la_SOURCES = decoder.c vm.c vmcmd.c
libdvdvm_la_LDFLAGS = $(THREAD_LIBS)
include_HEADERS =
noinst_HEADERS = decoder.h vm.h vmcmd.h
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment