[xiph-commits] r9155 - in experimental/derf/theora-exp: . lib

[j at motherfish-iii.xiph.org]

Author: j
Date: 2005-04-19 05:15:06 -0700 (Tue, 19 Apr 2005)
New Revision: 9155

Added:
   experimental/derf/theora-exp/theoradec.pc.in
   experimental/derf/theora-exp/theoraenc.pc.in
Removed:
   experimental/derf/theora-exp/theora-exp.pc.in
Modified:
   experimental/derf/theora-exp/Makefile.am
   experimental/derf/theora-exp/configure.ac
   experimental/derf/theora-exp/lib/Makefile.am
Log:
* do not use theora-exp.pc but theoradec.pc and theoraenc.pc
  so one can select libs for decoding/encoding via pkg-config

* add noinst_HEADERS to make make dist produce working tarballs

* add @OGG_LIBS@ to *la_LDFLAGS so the shared library is
  linked with libogg, as it depends on it.
  (as it is done with libvorbis, but not yet with theora-trunk)



Modified: experimental/derf/theora-exp/Makefile.am
===================================================================
--- experimental/derf/theora-exp/Makefile.am	2005-04-19 11:57:04 UTC (rev 9154)
+++ experimental/derf/theora-exp/Makefile.am	2005-04-19 12:15:06 UTC (rev 9155)
@@ -4,4 +4,4 @@
 SUBDIRS = lib include examples
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = theora-exp.pc
\ No newline at end of file
+pkgconfig_DATA = theoraenc.pc theoradec.pc

Modified: experimental/derf/theora-exp/configure.ac
===================================================================
--- experimental/derf/theora-exp/configure.ac	2005-04-19 11:57:04 UTC (rev 9154)
+++ experimental/derf/theora-exp/configure.ac	2005-04-19 12:15:06 UTC (rev 9155)
@@ -126,5 +126,6 @@
   Makefile lib/Makefile 
   include/Makefile include/theora/Makefile
   examples/Makefile
-  theora-exp.pc
+  theoradec.pc
+  theoraenc.pc
 ])

Modified: experimental/derf/theora-exp/lib/Makefile.am
===================================================================
--- experimental/derf/theora-exp/lib/Makefile.am	2005-04-19 11:57:04 UTC (rev 9154)
+++ experimental/derf/theora-exp/lib/Makefile.am	2005-04-19 12:15:06 UTC (rev 9155)
@@ -3,6 +3,22 @@
 INCLUDES = -I $(top_srcdir)/include
 AM_CFLAGS = $(OGG_CFLAGS)
 
+noinst_HEADERS = \
+	dct.h \
+	decint.h \
+	dequant.h \
+	encint.h \
+	enquant.h \
+	fdct.h \
+	huffdec.h \
+	huffenc.h \
+	huffman.h \
+	idct.h \
+	internal.h \
+	ocintrin.h \
+	psych.h \
+	quant.h 
+
 libtheorabase_la_SOURCES = \
 	fragment.c \
 	idct.c \
@@ -11,7 +27,7 @@
 	quant.c \
 	state.c
 
-libtheorabase_la_LDFLAGS = -version-info @V_LIB_CURRENT@:@V_LIB_REVISION@:@V_LIB_AGE@
+libtheorabase_la_LDFLAGS = -version-info @V_LIB_CURRENT@:@V_LIB_REVISION@:@V_LIB_AGE@ @OGG_LIBS@
 
 libtheoraenc_la_SOURCES = \
 	bitrate.c \
@@ -24,7 +40,7 @@
 	mcenc.c \
 	psych.c
 
-libtheoraenc_la_LDFLAGS = -version-info @V_LIB_CURRENT@:@V_LIB_REVISION@:@V_LIB_AGE@
+libtheoraenc_la_LDFLAGS = -version-info @V_LIB_CURRENT@:@V_LIB_REVISION@:@V_LIB_AGE@ @OGG_LIBS@
 
 libtheoradec_la_SOURCES = \
 	decinfo.c \
@@ -32,4 +48,5 @@
 	dequant.c \
 	huffdec.c
 
-libtheoradec_la_LDFLAGS = -version-info @V_LIB_CURRENT@:@V_LIB_REVISION@:@V_LIB_AGE@
+libtheoradec_la_LDFLAGS = -version-info @V_LIB_CURRENT@:@V_LIB_REVISION@:@V_LIB_AGE@ @OGG_LIBS@
+

Deleted: experimental/derf/theora-exp/theora-exp.pc.in
===================================================================
--- experimental/derf/theora-exp/theora-exp.pc.in	2005-04-19 11:57:04 UTC (rev 9154)
+++ experimental/derf/theora-exp/theora-exp.pc.in	2005-04-19 12:15:06 UTC (rev 9155)
@@ -1,14 +0,0 @@
-# theora installed pkg-config file
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: theora-exp
-Description: Theora experimental video codec
-Version: @VERSION@
-Requires: ogg >= 1.1.1
-Conflicts:
-Libs: -L${libdir} -ltheorabase -ltheoraenc -ltheoraadec
-Cflags: -I${includedir}

Added: experimental/derf/theora-exp/theoradec.pc.in
===================================================================
--- experimental/derf/theora-exp/theoradec.pc.in	2005-04-19 11:57:04 UTC (rev 9154)
+++ experimental/derf/theora-exp/theoradec.pc.in	2005-04-19 12:15:06 UTC (rev 9155)
@@ -0,0 +1,14 @@
+# theora installed pkg-config file
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: theoradec
+Description: Theora experimental video codec
+Version: @VERSION@
+Requires: ogg >= 1.1.1
+Conflicts:
+Libs: -L${libdir} -ltheorabase -ltheoradec
+Cflags: -I${includedir}

Added: experimental/derf/theora-exp/theoraenc.pc.in
===================================================================
--- experimental/derf/theora-exp/theoraenc.pc.in	2005-04-19 11:57:04 UTC (rev 9154)
+++ experimental/derf/theora-exp/theoraenc.pc.in	2005-04-19 12:15:06 UTC (rev 9155)
@@ -0,0 +1,14 @@
+# theora installed pkg-config file
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: theoraenc
+Description: Theora experimental video codec
+Version: @VERSION@
+Requires: ogg >= 1.1.1
+Conflicts:
+Libs: -L${libdir} -ltheorabase -ltheoraenc 
+Cflags: -I${includedir}