Hi all,
this bug report covers avifile-0.53.5. I usually compile
packages like this:
$ cd ~/src
$ tar xzvf avifile-0.53.5.tar.gz
$ cd ~/build
$ mkdir avifile-0.53.5 && cd avifile-0.53.5
$ ~/src/avifile-0.53.5/configure --enable-release && make
which does not work with the avifile package. It seems
that most of the Makefile.am are broken. Please see the
attached patch which fixes this for me ("make" works,
I hadn't time to test "make install", though).
I noticed that there are lots of additional errors in
the Makefile.am files. For example, my CFLAGS and CXXFLAGS
look like this:
$ export CXXFLAGS="-march=athlon -O6"
but avifile overwrites my settings with "-march=i586", for
example. :-( Also, it ignores the optimization settings
for some files.
Please have a look at this patch and apply it if you
want to. I won't hurt compilations that are made "in-place"
(in the same directory), so it can only improve the
installation process.
In short: Relative directories referring to read-only files
in Makefile.am are bad; "-I../../include" *will* break, for
example. Also references to source files like
"gcc -c ./somefile.c -o somefile.o"
has to be replaced by something like
"gcc -c @srcdir@/somefile.c -o somefile.o"
And, last but not least, things like:
"SOMETARGET=*.h"
will break since it is evaluated at compile-time, where the
files are no longer in the same directory. Resolve this by
typing in the files one-by-one ("echo *.h >>Makefile.am" and
then edit).
regards
johannes
--- /tmp/avifile-0.53.5/./bin/Makefile.am Sun Dec 3 15:21:51 2000
+++ /src/avifile-0.53.5/./bin/Makefile.am Mon May 7 20:00:03 2001
@@ -1 +1 @@
-pkgdata_DATA=*.ppm *.png
\ No newline at end of file
+pkgdata_DATA=about.ppm open.ppm pause.ppm play.ppm stop.ppm test.png
--- /tmp/avifile-0.53.5/./include/wine/Makefile.am Sun Nov 26 07:04:38 2000
+++ /src/avifile-0.53.5/./include/wine/Makefile.am Mon May 7 19:30:09 2001
@@ -1,2 +1,8 @@
wineincludedir=@includedir@/avifile/wine
-wineinclude_HEADERS=*.h
\ No newline at end of file
+wineinclude_HEADERS= basetsd.h config.h debugtools.h driver.h \
+ elfdll.h heap.h ldt.h mmreg.h module.h \
+ msacm.h msacmdrv.h ntdef.h pe_image.h \
+ poppack.h pshpack1.h pshpack2.h pshpack4.h \
+ pshpack8.h vfw.h winbase.h windef.h windows.h \
+ winerror.h winestring.h winnt.h winreg.h \
+ winuser.h
--- /tmp/avifile-0.53.5/./lib/audiodecoder/mpeg/Makefile.am Sat Dec 9 07:05:37
2000
+++ /src/avifile-0.53.5/./lib/audiodecoder/mpeg/Makefile.am Mon May 7 19:47:00
+2001
@@ -3,6 +3,6 @@
mpeglayer1.cpp mpeglayer2.cpp mpeglayer3.cpp mpegtable.cpp \
mpegtoraw.cpp
-CXXFLAGS=-I../../../include -march=i586 -O2
+CXXFLAGS=-I@top_srcdir@/include -march=i586 -O2
LIBS=
--- /tmp/avifile-0.53.5/./lib/audiodecoder/Makefile.am Sat Dec 9 07:05:37 2000
+++ /src/avifile-0.53.5/./lib/audiodecoder/Makefile.am Mon May 7 19:47:48 2001
@@ -2,7 +2,7 @@
libaudiodec_la_SOURCES=audiodecoder.cpp acm.cpp adpcm.cpp adpcm_impl.c \
gsm61dec.cpp pcm.cpp xa_gsm.c @AC3_SOURCES@
-CXXFLAGS=-I../../include -DWIN32_PATH=\"@WIN32_PATH@\" @AC3_CFLAGS@
+CXXFLAGS=-I@top_srcdir@/include -DWIN32_PATH=\"@WIN32_PATH@\" @AC3_CFLAGS@
SUBDIRS=mpeg
--- /tmp/avifile-0.53.5/./lib/audioencoder/Makefile.am Sat Dec 9 07:05:37 2000
+++ /src/avifile-0.53.5/./lib/audioencoder/Makefile.am Mon May 7 19:45:58 2001
@@ -2,6 +2,6 @@
noinst_LTLIBRARIES=libaudioenc.la
libaudioenc_la_SOURCES=audioencoder.cpp mp3encoder.cpp
-CXXFLAGS=-I../../include
+CXXFLAGS=-I@top_srcdir@/include
LIBS=
--- /tmp/avifile-0.53.5/./lib/avifile/Makefile.am Wed Jan 10 16:03:00 2001
+++ /src/avifile-0.53.5/./lib/avifile/Makefile.am Mon May 7 19:45:28 2001
@@ -2,6 +2,6 @@
libavi_io_la_SOURCES=AVIIndex.cpp AVIIndex2.cpp AVIReadHandler.cpp
AVIReadHandler2.cpp FastReadStream.cpp List.cpp File64.cpp \
AviRead.cpp Cache.cpp AviWrite.cpp AviSegWrite.cpp
-CXXFLAGS=-I../../include -Wno-multichar -march=i586 -fno-omit-frame-pointer
+CXXFLAGS=-I@top_srcdir@/include -Wno-multichar -march=i586 -fno-omit-frame-pointer
LIBS=
--- /tmp/avifile-0.53.5/./lib/aviplay/Makefile.am Sat Dec 9 07:05:39 2000
+++ /src/avifile-0.53.5/./lib/aviplay/Makefile.am Mon May 7 19:45:44 2001
@@ -1,6 +1,6 @@
noinst_LTLIBRARIES=libaviplay.la
libaviplay_la_SOURCES=audio.cpp aviplay.cpp aviutil.cpp
-CXXFLAGS=-march=i586 -I../../include @SDL_CFLAGS@
+CXXFLAGS=-march=i586 -I@top_srcdir@/include @SDL_CFLAGS@
LIBS=
--- /tmp/avifile-0.53.5/./lib/loader/Makefile.am Fri Jan 26 17:06:42 2001
+++ /src/avifile-0.53.5/./lib/loader/Makefile.am Mon May 7 19:44:50 2001
@@ -3,10 +3,10 @@
ext.c win32.c driver.c pe_resource.c resource.c registry.c elfdll.c afl.c
libloader_la_LIBADD=stubs.lo
-CFLAGS=-I../../include -DWIN32_PATH=\"@WIN32_PATH@\" \
+CFLAGS=-I@top_srcdir@/include -DWIN32_PATH=\"@WIN32_PATH@\" \
-D__WINE__ -Ddbg_printf=__vprintf -DTRACE=__vprintf -fno-omit-frame-pointer
-fno-inline
LIBS=
stubs.lo: stubs.s
- $(CC) -c ./stubs.s -o stubs.lo
+ $(CC) -c @srcdir@/stubs.s -o stubs.lo
--- /tmp/avifile-0.53.5/./lib/videocodec/Makefile.am Wed Jan 10 19:00:05 2001
+++ /src/avifile-0.53.5/./lib/videocodec/Makefile.am Mon May 7 19:44:41 2001
@@ -3,8 +3,8 @@
libvideocodec_la_SOURCES=VideoEncoder.cpp VideoDecoder.cpp Module.cpp \
ldt_keeper.cpp image.cpp
libvideocodec_la_LIBADD=codeckeeper.lo
-CXXFLAGS=-I../../include
+CXXFLAGS=-I@top_srcdir@/include
codeckeeper.lo: codeckeeper.cpp
- $(CXX) $(CXXFLAGS) $(DEFINES) -O0 -fPIC -c codeckeeper.cpp -o codeckeeper.lo
+ $(CXX) $(CXXFLAGS) $(DEFINES) -O0 -fPIC -c @srcdir@/codeckeeper.cpp -o
+codeckeeper.lo
LIBS=
--- /tmp/avifile-0.53.5/./lib/videocodec/DirectShow/Makefile.am Mon Dec 25 22:03:00
2000
+++ /src/avifile-0.53.5/./lib/videocodec/DirectShow/Makefile.am Mon May 7 19:42:54
+2001
@@ -1,5 +1,5 @@
noinst_LTLIBRARIES=libds_videocodec.la
libds_videocodec_la_SOURCES=guids.cpp inputpin.cpp outputpin.cpp allocator.cpp \
cmediasample.cpp DS_VideoDecoder.cpp
-CXXFLAGS=-I../../../include -march=i586
+CXXFLAGS=-I@top_srcdir@/include -march=i586
LIBS=
--- /tmp/avifile-0.53.5/./player/Makefile.am Wed Feb 7 18:25:18 2001
+++ /src/avifile-0.53.5/./player/Makefile.am Mon May 7 19:56:17 2001
@@ -5,13 +5,13 @@
CLEANFILES=*.moc
mywidget.moc: mywidget.h
- $(MOC) <mywidget.h >mywidget.moc
+ $(MOC) <@srcdir@/mywidget.h >mywidget.moc
MyConfig.moc: MyConfig.h
- $(MOC) <MyConfig.h >MyConfig.moc
+ $(MOC) <@srcdir@/MyConfig.h >MyConfig.moc
MyConfigImpl.moc: MyConfigImpl.h
- $(MOC) <MyConfigImpl.h >MyConfigImpl.moc
+ $(MOC) <@srcdir@/MyConfigImpl.h >MyConfigImpl.moc
qvolumebar.moc: qvolumebar.h
- $(MOC) <qvolumebar.h >qvolumebar.moc
+ $(MOC) <@srcdir@/qvolumebar.h >qvolumebar.moc
decoder_config.moc: decoder_config.cpp
$(MOC) < $< > $@
@@ -21,11 +21,11 @@
decoder_config.o: decoder_config.cpp decoder_config.moc
mmx.o: mmx.cpp
- $(CXX) $(CXXFLAGS) $(DEFINES) -O0 -fno-inline -fno-unroll-loops -c mmx.cpp
+ $(CXX) $(CXXFLAGS) -I$(top_builddir)/include $(DEFINES) -O0 -fno-inline
+-fno-unroll-loops -c @srcdir@/mmx.cpp
DEFINES=
-CXXFLAGS=-I../include @X_INCLUDES@ @QT_INCLUDES@ @SDL_CFLAGS@ \
+CXXFLAGS=-I@top_srcdir@/include @X_INCLUDES@ @QT_INCLUDES@ @SDL_CFLAGS@ \
-DSHARE_PATH=\"@datadir@/avifile\" -DWIN32_PATH=\"@WIN32_PATH@\" -march=i586
MOC=@MOC@
@@ -34,7 +34,7 @@
# @GL_LDFLAGS@
ui:
- $(UIC) ./config.ui -o ./MyConfig.h
- $(UIC) -impl ./MyConfig.h ./config.ui -o ./MyConfig.cpp
+ $(UIC) @srcdir@/config.ui -o ./MyConfig.h
+ $(UIC) -impl @srcdir@/MyConfig.h @srcdir@/config.ui -o ./MyConfig.cpp
# $(UIC) -subdecl MyConfigDialog_impl ./MyConfig.h ./config.ui -o
./MyConfigImpl.h
# $(UIC) -subimpl MyConfigDialog_impl ./MyConfig.h ./config.ui -o
./MyConfigImpl.cpp
--- /tmp/avifile-0.53.5/./samples/avitest/Makefile.am Wed Nov 29 15:09:27 2000
+++ /src/avifile-0.53.5/./samples/avitest/Makefile.am Mon May 7 20:05:26 2001
@@ -1,5 +1,5 @@
noinst_PROGRAMS=avitest
avitest_SOURCES=main.cpp
avitest_LDADD=../../lib/libaviplay.la
-CXXFLAGS=-I../../include
+CXXFLAGS=-I@top_srcdir@/include
LIBS=@LIBS@
--- /tmp/avifile-0.53.5/./samples/benchmark/Makefile.am Mon Dec 18 09:39:16 2000
+++ /src/avifile-0.53.5/./samples/benchmark/Makefile.am Mon May 7 20:05:16 2001
@@ -2,10 +2,10 @@
benchmark_SOURCES=main.cpp renderer.cpp
benchmark_LDADD=mmx.o ../../lib/libaviplay.la
mmx.o: mmx.cpp
- $(CXX) $(CXXFLAGS) $(DEFINES) -O0 -c mmx.cpp
+ $(CXX) $(CXXFLAGS) $(DEFINES) -I$(top_builddir)/include -O0 -c @srcdir@/mmx.cpp
CLEANFILES=*.moc
-CXXFLAGS=-I../../include @QT_INCLUDES@ @SDL_CFLAGS@
+CXXFLAGS=-I@top_srcdir@/include @QT_INCLUDES@ @SDL_CFLAGS@
LIBS=@LIBS@ @X_LDFLAGS@ @QT_LDFLAGS@ @QT_NAME@ @DGA_LDADD@ @VM_LDADD@ @SDL_LIBS@
--- /tmp/avifile-0.53.5/./samples/extractor/Makefile.am Wed Nov 29 15:09:27 2000
+++ /src/avifile-0.53.5/./samples/extractor/Makefile.am Mon May 7 20:06:04 2001
@@ -1,5 +1,5 @@
noinst_PROGRAMS=extractor
extractor_SOURCES=extractor.cpp
extractor_LDADD=../../lib/libaviplay.la
-CXXFLAGS=-I../../include -march=i586
+CXXFLAGS=-I@top_srcdir@/include -march=i586
LIBS=@LIBS@
--- /tmp/avifile-0.53.5/./samples/qtrecompress/Makefile.am Wed Jan 10 19:01:48
2001
+++ /src/avifile-0.53.5/./samples/qtrecompress/Makefile.am Mon May 7 20:03:21
+2001
@@ -6,7 +6,7 @@
../../lib/libaviplay.la
CLEANFILES=*.moc
-CXXFLAGS=-I../../include @X_INCLUDES@ @QT_INCLUDES@ @SDL_CFLAGS@
+CXXFLAGS=-I@top_srcdir@/include @X_INCLUDES@ @QT_INCLUDES@ @SDL_CFLAGS@
MOC=@MOC@
@@ -22,7 +22,7 @@
filters.o: filters.h filters.moc
rgn.o: rgn.cpp
- $(CXX) $(CXXFLAGS) $(DEFINES) -O0 -c rgn.cpp
+ $(CXX) $(CXXFLAGS) $(DEFINES) -O0 -c @srcdir@/rgn.cpp
%.moc: %.h
$(MOC) < $< > $@
--- /tmp/avifile-0.53.5/./samples/qtvidcap/Makefile.am Mon Jan 29 12:33:59 2001
+++ /src/avifile-0.53.5/./samples/qtvidcap/Makefile.am Mon May 7 19:58:28 2001
@@ -10,7 +10,7 @@
install-exec-local:
@INSTALL@ -m4755 ./kv4lsetup $(DESTDIR)@bindir@
-CXXFLAGS=-I../../include @X_INCLUDES@ @QT_INCLUDES@ @SDL_CFLAGS@
+CXXFLAGS=-I@top_srcdir@/include @X_INCLUDES@ @QT_INCLUDES@ @SDL_CFLAGS@
MOC=@MOC@
UIC=@UIC@
PGP signature
