libaacs | branch: master | npzacs <npz...@gmail.com> | Sun Jan 4 18:13:33 2015 +0200| [2b05b38b8708be0c406ad01b6b89c759cace038e] | committer: npzacs
Merge makefiles > http://git.videolan.org/gitweb.cgi/libaacs.git/?a=commit;h=2b05b38b8708be0c406ad01b6b89c759cace038e --- Makefile.am | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- configure.ac | 2 +- src/Makefile.am | 88 ----------------------------------------------------- 3 files changed, 89 insertions(+), 92 deletions(-) diff --git a/Makefile.am b/Makefile.am index f4b0200..92174e0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,8 +1,93 @@ -SUBDIRS=src - ACLOCAL_AMFLAGS=-I m4 EXTRA_DIST=bootstrap COPYING KEYDB.cfg README.txt ChangeLog +SET_FEATURES = @SET_FEATURES@ +SET_INCLUDES = -I$(top_srcdir)/src -I$(top_builddir)/src/libaacs + +AM_CFLAGS = -std=c99 $(SET_FEATURES) $(SET_INCLUDES) $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS) +AM_YFLAGS = -d -p libaacs_yy + +lib_LTLIBRARIES = libaacs.la +libaacs_la_SOURCES=\ + src/libaacs/aacs.h \ + src/libaacs/mmc.h \ + src/libaacs/mkb.h \ + src/libaacs/aacs.c \ + src/libaacs/mmc.c \ + src/libaacs/crypto.c \ + src/libaacs/crypto.h \ + src/libaacs/mkb.c \ + src/file/dirs.h \ + src/file/file.h \ + src/file/filesystem.h \ + src/file/file_posix.c \ + src/file/keydbcfg.c \ + src/file/keydbcfg.h \ + src/file/keydb.h \ + src/file/keydbcfg-parser.y \ + src/file/keydbcfg-lexer.l \ + src/file/path.h \ + src/util/attributes.h \ + src/util/macro.h \ + src/util/logging.c \ + src/util/logging.h \ + src/util/strutl.c \ + src/util/strutl.h + +EXTRA_libaacs_la_SOURCES=\ + src/libaacs/ec.c + +if HAVE_DARWIN +libaacs_la_SOURCES+= \ + src/file/dirs_darwin.c +else +if HAVE_WIN32 +libaacs_la_SOURCES+= \ + src/file/dirs_win32.c +else +libaacs_la_SOURCES+= \ + src/file/dirs_xdg.c \ + src/file/path.c +endif +endif + +pkginclude_HEADERS = \ + src/libaacs/aacs.h \ + src/file/filesystem.h \ + src/libaacs/aacs-version.h + +libaacs_la_LDFLAGS= -no-undefined -version-info $(LT_VERSION_INFO) +libaacs_la_LIBADD = $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = src/libaacs.pc + +BUILT_SOURCES = src/libaacs.pc src/libaacs/aacs-version.h src/file/keydbcfg-parser.h src/file/keydbcfg-parser.c src/file/keydbcfg-lexer.c + +CLEANFILES = $(BUILT_SOURCES) + clean-lex-yacc: - $(MAKE) -C src $@ + -rm -f $(BUILT_SOURCES) + +# do not distribute files that should be generated by lex/yacc locally +dist-hook: + (cd $(distdir) && rm -f $(BUILT_SOURCES)) + +# +# programs +# + +noinst_PROGRAMS = parser_test +bin_PROGRAMS = aacs_info + +parser_test_SOURCES = \ + src/examples/parser_test.c \ + src/file/keydbcfg-parser.y \ + src/file/keydbcfg-lexer.l \ + src/util/strutl.c \ + src/util/logging.c +parser_test_CFLAGS = -std=c99 $(SET_FEATURES) $(SET_INCLUDES) + +aacs_info_SOURCES = src/examples/aacs_info.c +aacs_info_CFLAGS = -std=c99 $(SET_FEATURES) $(SET_INCLUDES) +aacs_info_LDADD = libaacs.la diff --git a/configure.ac b/configure.ac index 155acad..ab7897f 100644 --- a/configure.ac +++ b/configure.ac @@ -196,5 +196,5 @@ AC_SUBST(LT_VERSION_INFO) dnl generate output files AC_SUBST(SET_FEATURES) -AC_CONFIG_FILES([Makefile src/Makefile src/libaacs.pc src/libaacs/aacs-version.h]) +AC_CONFIG_FILES([Makefile src/libaacs.pc src/libaacs/aacs-version.h]) AC_OUTPUT diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index 6725622..0000000 --- a/src/Makefile.am +++ /dev/null @@ -1,88 +0,0 @@ -SET_FEATURES = @SET_FEATURES@ -SET_INCLUDES = -I$(top_srcdir) -Ifile -Ilibaacs - -AM_CFLAGS = -std=c99 $(SET_FEATURES) $(SET_INCLUDES) $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS) -AM_YFLAGS = -d -p libaacs_yy - -lib_LTLIBRARIES = libaacs.la -libaacs_la_SOURCES=\ - libaacs/aacs.h \ - libaacs/mmc.h \ - libaacs/mkb.h \ - libaacs/aacs.c \ - libaacs/mmc.c \ - libaacs/crypto.c \ - libaacs/crypto.h \ - libaacs/mkb.c \ - file/dirs.h \ - file/file.h \ - file/filesystem.h \ - file/file_posix.c \ - file/keydbcfg.c \ - file/keydbcfg.h \ - file/keydb.h \ - file/keydbcfg-parser.y \ - file/keydbcfg-lexer.l \ - file/path.h \ - util/attributes.h \ - util/macro.h \ - util/logging.c \ - util/logging.h \ - util/strutl.c \ - util/strutl.h - -EXTRA_libaacs_la_SOURCES=\ - libaacs/ec.c - -if HAVE_DARWIN -libaacs_la_SOURCES+= \ - file/dirs_darwin.c -else -if HAVE_WIN32 -libaacs_la_SOURCES+= \ - file/dirs_win32.c -else -libaacs_la_SOURCES+= \ - file/dirs_xdg.c \ - file/path.c -endif -endif - -pkginclude_HEADERS = \ - libaacs/aacs.h \ - file/filesystem.h \ - libaacs/aacs-version.h - -libaacs_la_LDFLAGS= -no-undefined -version-info $(LT_VERSION_INFO) -libaacs_la_LIBADD = $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libaacs.pc - -BUILT_SOURCES = file/keydbcfg-parser.h file/keydbcfg-parser.c file/keydbcfg-lexer.c - -CLEANFILES = $(BUILT_SOURCES) - -clean-lex-yacc: - -rm -f $(BUILT_SOURCES) - -# do not distribute files that should be generated by lex/yacc locally -dist-hook: - (cd $(distdir) && rm -f $(BUILT_SOURCES)) - -# -# programs -# - -noinst_PROGRAMS = parser_test -bin_PROGRAMS = aacs_info - -parser_test_SOURCES = examples/parser_test.c \ - file/keydbcfg-parser.y \ - file/keydbcfg-lexer.l \ - util/strutl.c \ - util/logging.c -parser_test_CFLAGS = -std=c99 $(SET_FEATURES) $(SET_INCLUDES) - -aacs_info_SOURCES = examples/aacs_info.c -aacs_info_CFLAGS = -std=c99 $(SET_FEATURES) $(SET_INCLUDES) -aacs_info_LDADD = libaacs.la _______________________________________________ libaacs-devel mailing list libaacs-devel@videolan.org https://mailman.videolan.org/listinfo/libaacs-devel
