diff options
| author | Conrad Parker <conrad@xiph.org> | 2010-04-20 08:47:26 +0000 |
|---|---|---|
| committer | Conrad Parker <conrad@xiph.org> | 2010-04-20 08:47:26 +0000 |
| commit | d8bd2ae687193f64b8d7af584d39d86567be1cb5 (patch) | |
| tree | 78afca73a40831068920e6f7b93d9a6d15c20659 | |
| parent | 7ed233e53d8042e31b1829484fb09d304ded2bda (diff) | |
| download | tremor-d8bd2ae687193f64b8d7af584d39d86567be1cb5.tar.gz | |
Merge r17150,r17151,r17152 from trunk/Tremor
Add a pkgconfig file, include html docs in dist. NB. this branch has
no Win32 directory.
Adapted from patch by Stefan Kost.
git-svn-id: https://svn.xiph.org/branches/lowmem-branch/Tremor@17154 0101bb08-14d6-0310-b084-bc0e0c8e3800
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | vorbisidec.pc.in | 14 |
3 files changed, 21 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 81fbdc4..1d18b1a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,6 +2,9 @@ AUTOMAKE_OPTIONS = foreign INCLUDES = -I./ +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = vorbisidec.pc + lib_LTLIBRARIES = libvorbisidec.la libvorbisidec_la_SOURCES = mdct.c dsp.c info.c misc.c \ @@ -26,6 +29,9 @@ includedir = $(prefix)/include/tremor include_HEADERS = ivorbiscodec.h ivorbisfile.h ogg.h os_types.h config_types.h +EXTRA_DIST = vorbisidec.pc.in \ + $(srcdir)/doc/*.html + example: -ln -fs . vorbis $(MAKE) ivorbisfile_example diff --git a/configure.in b/configure.in index 0b6e01c..404fbc5 100644 --- a/configure.in +++ b/configure.in @@ -134,4 +134,4 @@ AC_SUBST(LIBS) AC_SUBST(DEBUG) AC_SUBST(PROFILE) -AC_OUTPUT(Makefile Version_script) +AC_OUTPUT(Makefile Version_script vorbisidec.pc) diff --git a/vorbisidec.pc.in b/vorbisidec.pc.in new file mode 100644 index 0000000..9c09524 --- /dev/null +++ b/vorbisidec.pc.in @@ -0,0 +1,14 @@ +# libvorbisidec pkg-config source file + +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: vorbisidec +Description: vorbisidec is the integer Ogg Vorbis library +Version: @VERSION@ +Requires: ogg +Conflicts: +Libs: -L${libdir} -lvorbisidec -lm +Cflags: -I${includedir} |