diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | config.h.in | 71 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | doc/Doxyfile.in (renamed from doc/Doxyfile) | 6 | ||||
| -rw-r--r-- | doc/Makefile.am | 4 | ||||
| -rw-r--r-- | example/Makefile.am | 2 |
7 files changed, 80 insertions, 8 deletions
@@ -1,5 +1,4 @@ *.a -*.in *.la *.lai *.lib @@ -27,6 +26,7 @@ config.status config.sub configure depcomp +doc/Doxyfile doc/doxygen_man doc/doxygen_html doc/doxygen_html.tar diff --git a/Makefile.am b/Makefile.am index bf2e17e..bc03ae6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,5 @@ +TAR_OPTIONS = --owner=0 --group=0 + SUBDIRS = src doc test example pkgconfig_DATA = tuberia.pc diff --git a/config.h.in b/config.h.in new file mode 100644 index 0000000..78466ef --- /dev/null +++ b/config.h.in @@ -0,0 +1,71 @@ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if you have the `gettimeofday' function. */ +#undef HAVE_GETTIMEOFDAY + +/* Define to 1 if you have the <inttypes.h> header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the `pthread' library (-lpthread). */ +#undef HAVE_LIBPTHREAD + +/* Define to 1 if your system has a GNU libc compatible `malloc' function, and + to 0 otherwise. */ +#undef HAVE_MALLOC + +/* Define to 1 if you have the <memory.h> header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the <stdint.h> header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the <stdlib.h> header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the <strings.h> header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the <string.h> header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the <sys/stat.h> header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the <sys/time.h> header file. */ +#undef HAVE_SYS_TIME_H + +/* Define to 1 if you have the <sys/types.h> header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the <unistd.h> header file. */ +#undef HAVE_UNISTD_H + +/* Name of package */ +#undef PACKAGE + +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the home page for this package. */ +#undef PACKAGE_URL + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + +/* Version number of package */ +#undef VERSION + +/* Define to rpl_malloc if the replacement function should be used. */ +#undef malloc diff --git a/configure.ac b/configure.ac index d02c43b..28b21db 100644 --- a/configure.ac +++ b/configure.ac @@ -63,6 +63,7 @@ AM_CONDITIONAL([TUBERIATEST], [test x$enable_tuberia_test = xyes]) AC_CONFIG_FILES([Makefile src/Makefile + doc/Doxyfile doc/Makefile test/Makefile example/Makefile diff --git a/doc/Doxyfile b/doc/Doxyfile.in index 8b3453e..c6f4f4a 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile.in @@ -874,7 +874,7 @@ WARN_LOGFILE = # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING # Note: If this tag is empty the current directory is searched. -INPUT = ../src/tuberia.h +INPUT = @srcdir@/../src/tuberia.h # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses @@ -1194,7 +1194,7 @@ GENERATE_HTML = YES # The default directory is: html. # This tag requires that the tag GENERATE_HTML is set to YES. -HTML_OUTPUT = doxygen_html +HTML_OUTPUT = @builddir@/doxygen_html # The HTML_FILE_EXTENSION tag can be used to specify the file extension for each # generated HTML page (for example: .htm, .php, .asp). @@ -2067,7 +2067,7 @@ GENERATE_MAN = YES # The default directory is: man. # This tag requires that the tag GENERATE_MAN is set to YES. -MAN_OUTPUT = doxygen_man +MAN_OUTPUT = @builddir@/doxygen_man # The MAN_EXTENSION tag determines the extension that is added to the generated # man pages. In case the manual section does not start with a number, the number diff --git a/doc/Makefile.am b/doc/Makefile.am index 0f61643..4262876 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,10 +1,8 @@ -EXTRA_DIST = Doxyfile - if DOXYGEN doc_DATA = doxygen_html.tar man3_MANS = doxygen_man/man3/tuberia.h.3 -doxygen_html doxygen_man/man3/tuberia.h.3 &: Doxyfile ../src/tuberia.h +doxygen_html doxygen_man/man3/tuberia.h.3 &: Doxyfile $(srcdir)/../src/tuberia.h doxygen Doxyfile doxygen_html.tar: doxygen_html diff --git a/example/Makefile.am b/example/Makefile.am index 5270584..a30c12e 100644 --- a/example/Makefile.am +++ b/example/Makefile.am @@ -1,7 +1,7 @@ if EXAMPLES noinst_PROGRAMS = decode_resize_encode -decode_resize_encode_CFLAGS = $(AM_CFLAGS) -I../src +decode_resize_encode_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/../src decode_resize_encode_LDADD = ../src/libtuberia.a decode_resize_encode_LDFLAGS = -lpthread -lavcodec -lavformat -lavutil -lswscale decode_resize_encode_SOURCES = decode_resize_encode.c |