[libdvdcss-devel] build: get rid of recursion for building the library and the csstest program.

[Diego Elio Pettenò]

libdvdcss | branch: master | Diego Elio Pettenò <***@flameeyes.eu> | Wed Feb 13 17:36:48 2013 -0800| [ee2b1c28e2b36e0c9fb0a8bd06d948bd4aae8ddf] | committer: Jean-Baptiste Kempf

build: get rid of recursion for building the library and the csstest program.

http://git.videolan.org/gitweb.cgi/libdvdcss.git/?a=commit;h=ee2b1c28e2b36e0c9fb0a8bd06d948bd4aae8ddf

---

.gitignore | 4 +++-
Makefile.am | 44 +++++++++++++++++++++++++++++++++++++++++++-
configure.ac | 3 ---
src/Makefile.am | 37 -------------------------------------
src/dvdcss/Makefile.am | 3 ---
test/Makefile.am | 15 ---------------
6 files changed, 46 insertions(+), 60 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8125441..fb817ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
*.pc
.auto
.deps
+.dirstamp
.libs
Makefile
Makefile.in
@@ -19,6 +20,8 @@ config.log
config.status
config.sub
configure
+csstest
+depcomp
doc/doxygen.cfg
doc/html
doc/latex
@@ -27,4 +30,3 @@ libtool
ltmain.sh
missing
stamp-*
-test/csstest
diff --git a/Makefile.am b/Makefile.am
index c73573d..1fc9dcd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = src test doc
+SUBDIRS = doc

EXTRA_DIST = libdvdcss.spec bootstrap

@@ -7,3 +7,45 @@ doc-dummy:
doc: doc-dummy
$(MAKE) -C doc

+lib_LTLIBRARIES = libdvdcss.la
+EXTRA_PROGRAMS = csstest
+
+libdvdcss_la_SOURCES = \
+ src/libdvdcss.c \
+ src/libdvdcss.h \
+ src/device.c \
+ src/device.h \
+ src/css.c \
+ src/css.h \
+ src/csstables.h \
+ src/ioctl.c \
+ src/ioctl.h \
+ src/error.c \
+ src/common.h
+
+libdvdcss_la_LDFLAGS = -version-info 3:0:1 $(DVDCSS_LDFLAGS)
+libdvdcss_la_LIBADD =
+
+if SYS_BSDI
+libdvdcss_la_SOURCES += \
+ src/bsdi_ioctl.c \
+ src/bsdi_dvd.h
+endif
+
+if SYS_BSDI_LIBDVD
+libdvdcss_la_LIBADD += -ldvd
+endif
+
+if !SYS_MSVC
+libdvdcss_la_LDFLAGS += = -no-undefined
+endif
+
+csstest_SOURCES = test/csstest.c
+csstest_LDADD = libdvdcss.la
+csstest_CFLAGS = -I $(top_srcdir)/src
+
+pkgincludedir = $(includedir)/dvdcss
+pkginclude_HEADERS = src/dvdcss/dvdcss.h
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = src/libdvdcss.pc
diff --git a/configure.ac b/configure.ac
index 1dabf88..a260c12 100644
--- a/configure.ac
+++ b/configure.ac
@@ -211,9 +211,6 @@ AC_SUBST(DVDCSS_LDFLAGS)
AC_OUTPUT([
Makefile
doc/Makefile
- src/Makefile
- src/dvdcss/Makefile
- test/Makefile
src/libdvdcss.pc
])

diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index 3823b50..0000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-SUBDIRS = dvdcss
-
-lib_LTLIBRARIES = libdvdcss.la
-
-libdvdcss_la_SOURCES = \
- libdvdcss.c libdvdcss.h \
- device.c device.h \
- css.c css.h csstables.h \
- ioctl.c ioctl.h \
- error.c \
- common.h \
- $(bsdi_sources)
-
-EXTRA_libdvdcss_la_SOURCES = \
- $(bsdi_extras)
-
-libdvdcss_la_LIBADD = $(bsdi_libadd)
-libdvdcss_la_LDFLAGS = -version-info 3:0:1 $(libtool_flags) @DVDCSS_LDFLAGS@
-
-bsdi_extras = bsdi_ioctl.c bsdi_dvd.h
-
-if SYS_BSDI
-bsdi_sources = $(bsdi_extras)
-endif
-
-if SYS_BSDI_LIBDVD
-bsdi_libadd = -ldvd
-endif
-
-if SYS_MSVC
-else
-libtool_flags = -no-undefined
-endif
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libdvdcss.pc
-
diff --git a/src/dvdcss/Makefile.am b/src/dvdcss/Makefile.am
deleted file mode 100644
index 4674696..0000000
--- a/src/dvdcss/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-pkgincludedir = $(includedir)/dvdcss
-
-pkginclude_HEADERS = dvdcss.h
diff --git a/test/Makefile.am b/test/Makefile.am
deleted file mode 100644
index f1c5a63..0000000
--- a/test/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-
-noinst_PROGRAMS = csstest #dvd_region
-
-csstest_SOURCES = csstest.c
-csstest_LDADD = $(top_builddir)/src/libdvdcss.la $(bsdi_libadd)
-csstest_CFLAGS = -I$(top_srcdir)/src
-
-#dvd_region_SOURCES = dvd_region.c
-#dvd_region_LDADD = $(top_builddir)/src/libdvdcss.la
-#dvd_region_CFLAGS = -I$(top_srcdir)/src
-
-if SYS_BSDI_LIBDVD
-bsdi_libadd = -ldvd
-endif
-