diff options
| author | David Schleef <ds@schleef.org> | 2003-12-18 09:49:50 +0000 |
|---|---|---|
| committer | David Schleef <ds@schleef.org> | 2003-12-18 09:49:50 +0000 |
| commit | ef3ed344af7d0eb330f68c85d31acfa9471d1573 (patch) | |
| tree | 012d45187cfa98f972073142ce341190252e17f7 /ext/Makefile.am | |
| parent | 70a4a0e00218745b2bf7ad0b145fe9a967981cb4 (diff) | |
| download | gst-plugins-bad-ef3ed344af7d0eb330f68c85d31acfa9471d1573.tar.gz gst-plugins-bad-ef3ed344af7d0eb330f68c85d31acfa9471d1573.tar.bz2 gst-plugins-bad-ef3ed344af7d0eb330f68c85d31acfa9471d1573.zip | |
Merge HEAD from CAPS-ROOT to CAPS-MERGE-3
Original commit message from CVS:
Merge HEAD from CAPS-ROOT to CAPS-MERGE-3
Diffstat (limited to 'ext/Makefile.am')
| -rw-r--r-- | ext/Makefile.am | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/ext/Makefile.am b/ext/Makefile.am index a26660d7..cdcfefe7 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -190,6 +190,12 @@ else MPEG2DEC_DIR= endif +if USE_MPEG2ENC +MPEG2ENC_DIR=mpeg2enc +else +MPEG2ENC_DIR= +endif + if USE_MPLEX MPLEX_DIR=mplex else @@ -318,6 +324,7 @@ SUBDIRS=\ $(MAS_DIR) \ $(MIKMOD_DIR) \ $(MPEG2DEC_DIR) \ + $(MPEG2ENC_DIR) \ $(MPLEX_DIR) \ $(OGG_DIR) \ $(PANGO_DIR) \ @@ -367,6 +374,7 @@ DIST_SUBDIRS=\ mad \ mikmod \ mpeg2dec \ + mpeg2enc \ mplex \ ogg \ pango \ |