libaacs | branch: master | npzacs <npz...@gmail.com> | Tue Oct 8 10:58:13 2013 +0300| [2a4ef4b0013e34b06586b068ad4fc35f96672201] | committer: npzacs
Reduce make recursion: merge src/examples/Makefile.am to src/Makefile.am > http://git.videolan.org/gitweb.cgi/libaacs.git/?a=commit;h=2a4ef4b0013e34b06586b068ad4fc35f96672201 --- Makefile.am | 2 +- configure.ac | 2 +- src/Makefile.am | 16 ++++++++++++++++ src/examples/Makefile.am | 18 ------------------ 4 files changed, 18 insertions(+), 20 deletions(-) diff --git a/Makefile.am b/Makefile.am index 26625c0..f4b0200 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS=src src/examples +SUBDIRS=src ACLOCAL_AMFLAGS=-I m4 diff --git a/configure.ac b/configure.ac index 466f7f9..2c3db97 100644 --- a/configure.ac +++ b/configure.ac @@ -177,5 +177,5 @@ AC_SUBST(LT_VERSION_INFO) dnl generate output files AC_SUBST(SET_FEATURES) -AC_CONFIG_FILES([Makefile src/Makefile src/examples/Makefile src/libaacs.pc src/libaacs/aacs-version.h]) +AC_CONFIG_FILES([Makefile src/Makefile src/libaacs.pc src/libaacs/aacs-version.h]) AC_OUTPUT diff --git a/src/Makefile.am b/src/Makefile.am index c96f555..882bab1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -67,3 +67,19 @@ clean-lex-yacc: # 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 +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 diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am deleted file mode 100644 index e7af9ea..0000000 --- a/src/examples/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -SET_FEATURES = -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112L -D_REENTRANT -SET_INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src/file - -AM_CFLAGS = -std=c99 $(SET_FEATURES) $(SET_INCLUDES) - -AACS_LIB = $(top_builddir)/src/libaacs.la - -noinst_PROGRAMS=parser_test -bin_PROGRAMS=aacs_info - -parser_test_SOURCES=parser_test.c \ - $(top_builddir)/src/keydbcfg-lexer.c \ - $(top_builddir)/src/keydbcfg-parser.c - -parser_test_LDADD = $(AACS_LIB) - -aacs_info_SOURCES=aacs_info.c -aacs_info_LDADD = $(AACS_LIB) _______________________________________________ libaacs-devel mailing list libaacs-devel@videolan.org https://mailman.videolan.org/listinfo/libaacs-devel
