1 --- ffmpeg/libavcodec/libpostproc/Makefile.orig 2006-01-27 00:42:28.000000000 +0100
2 +++ ffmpeg/libavcodec/libpostproc/Makefile 2006-01-29 13:37:17.993360000 +0100
4 VPATH=$(SRC_PATH)/libavcodec/libpostproc
7 -ifeq ($(BUILD_SHARED),yes)
8 LIBVERSION=$(SPPVERSION)
13 -SOBJS=postprocess_pic.o
16 CFLAGS = $(OPTFLAGS) $(MLIB_INC) -I. -I.. $(EXTRA_INC)
17 # -I/usr/X11R6/include/
24 - $(CC) -c $(CFLAGS) $(LIBOBJFLAGS) -I$(SRC_PATH)/libavcodec -I../.. -o $@ $<
26 + libtool --mode=compile --tag=CC $(CC) -c $(CFLAGS) $(LIBOBJFLAGS) -I$(SRC_PATH)/libavcodec -I../.. -o $@ $<
28 -all: $(SWSLIB) $(LIB) $(SLIBNAME)
29 +all: $(SWSLIB) $(LIB)
32 rm -f *.o *.d *~ *.a *.lib *.so *.dylib *.dll
34 $(CC) -MM $(CFLAGS) postprocess.c 1>.depend
36 ifeq ($(BUILD_SHARED),yes)
37 -postprocess_pic.o: postprocess.c
38 - $(CC) -c $(CFLAGS) -fomit-frame-pointer -fPIC -DPIC -I.. -I../.. -o $@ $<
40 -$(SLIBNAME): $(SOBJS)
41 - $(CC) $(SHFLAGS) -o $(SLIBNAME) $(SOBJS)
42 +RPATH= -rpath $(libdir)
51 + libtool --mode=link --tag=CC $(CC) -o $(LIB) $(OBJS) $(RPATH) -version-number `echo $(LIBVERSION) | tr . :`
54 -ifeq ($(BUILD_SHARED),yes)
55 -ifeq ($(CONFIG_WIN32),yes)
56 - install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)"
58 - install -d $(libdir)
59 - install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \
60 - $(libdir)/$(SLIBNAME_WITH_VERSION)
61 - ln -sf $(SLIBNAME_WITH_VERSION) \
62 - $(libdir)/$(SLIBNAME_WITH_MAJOR)
63 - ln -sf $(SLIBNAME_WITH_VERSION) \
64 - $(libdir)/$(SLIBNAME)
68 - mkdir -p $(prefix)/include/postproc
69 - install -m 644 $(SRC_PATH)/libavcodec/libpostproc/postprocess.h $(prefix)/include/postproc/postprocess.h
70 - install -d $(libdir)/pkgconfig
71 - install -m 644 ../../libpostproc.pc $(libdir)/pkgconfig
72 + install -d $(DESTDIR)$(libdir)
73 + libtool --mode=install install $(INSTALLSTRIP) $(LIB) $(DESTDIR)$(libdir)
74 + install -d $(DESTDIR)$(prefix)/include/postproc
75 + install -m 644 $(SRC_PATH)/libavcodec/libpostproc/postprocess.h $(DESTDIR)$(prefix)/include/postproc/postprocess.h
76 + install -d $(DESTDIR)$(libdir)/pkgconfig
77 + install -m 644 ../../libpostproc.pc $(DESTDIR)$(libdir)/pkgconfig
81 --- ffmpeg/libavcodec/Makefile.orig 2006-01-27 00:42:28.000000000 +0100
82 +++ ffmpeg/libavcodec/Makefile 2006-01-29 13:45:46.901164750 +0100
84 # NOTE: -I.. is needed to include config.h
85 CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -I$(SRC_PATH)/libavutil -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE $(AMR_CFLAGS)
87 -OBJS= bitstream.o utils.o mem.o allcodecs.o \
88 - mpegvideo.o jrevdct.o jfdctfst.o jfdctint.o\
89 - mpegaudio.o ac3enc.o mjpeg.o resample.o resample2.o dsputil.o \
90 - motion_est.o imgconvert.o imgresample.o \
91 - mpeg12.o mpegaudiodec.o pcm.o simple_idct.o \
92 - ratecontrol.o adpcm.o eval.o error_resilience.o \
93 - fft.o mdct.o raw.o golomb.o cabac.o\
94 - dpcm.o adx.o faandct.o parser.o g726.o \
95 - vp3dsp.o h264idct.o rangecoder.o pnm.o h263.o msmpeg4.o h263dec.o \
97 +OBJS= bitstream.lo utils.lo mem.lo allcodecs.lo \
98 + mpegvideo.lo jrevdct.lo jfdctfst.lo jfdctint.lo\
99 + mpegaudio.lo ac3enc.lo mjpeg.lo resample.lo resample2.lo dsputil.lo \
100 + motion_est.lo imgconvert.lo imgresample.lo \
101 + mpeg12.lo mpegaudiodec.lo pcm.lo simple_idct.lo \
102 + ratecontrol.lo adpcm.lo eval.lo error_resilience.lo \
103 + fft.lo mdct.lo raw.lo golomb.lo cabac.lo\
104 + dpcm.lo adx.lo faandct.lo parser.lo g726.lo \
105 + vp3dsp.lo h264idct.lo rangecoder.lo pnm.lo h263.lo msmpeg4.lo h263dec.lo \
108 ifeq ($(CONFIG_AASC_DECODER),yes)
112 ifeq ($(CONFIG_ALAC_DECODER),yes)
116 ifneq ($(CONFIG_ASV1_DECODER)$(CONFIG_ASV1_ENCODER)$(CONFIG_ASV2_DECODER)$(CONFIG_ASV2_ENCODER),)
120 ifeq ($(CONFIG_CINEPAK_DECODER),yes)
124 ifeq ($(CONFIG_COOK_DECODER),yes)
128 ifneq ($(CONFIG_CLJR_DECODER)$(CONFIG_CLJR_ENCODER),)
132 ifeq ($(CONFIG_CYUV_DECODER),yes)
136 ifeq ($(CONFIG_DVBSUB_DECODER),yes)
138 + OBJS+= dvbsubdec.lo
140 ifeq ($(CONFIG_DVBSUB_ENCODER),yes)
144 ifeq ($(CONFIG_DVDSUB_DECODER),yes)
148 ifeq ($(CONFIG_DVDSUB_ENCODER),yes)
150 + OBJS+= dvdsubenc.lo
152 ifneq ($(CONFIG_DVVIDEO_DECODER)$(CONFIG_DVVIDEO_ENCODER),)
156 ifeq ($(CONFIG_EIGHTBPS_DECODER),yes)
160 ifneq ($(CONFIG_FFV1_DECODER)$(CONFIG_FFV1_ENCODER),)
164 ifeq ($(CONFIG_FLAC_DECODER),yes)
168 ifeq ($(CONFIG_FLIC_DECODER),yes)
170 + OBJS+= flicvideo.lo
172 ifeq ($(CONFIG_FOURXM_DECODER),yes)
176 ifeq ($(CONFIG_FRAPS_DECODER),yes)
180 ifneq ($(CONFIG_H261_DECODER)$(CONFIG_H261_ENCODER),)
184 ifneq ($(CONFIG_H264_DECODER)$(CONFIG_SVQ3_DECODER),)
188 ifneq ($(CONFIG_HUFFYUV_DECODER)$(CONFIG_HUFFYUV_ENCODER)$(CONFIG_FFVHUFF_DECODER)$(CONFIG_FFVHUFF_ENCODER),)
192 ifeq ($(CONFIG_IDCIN_DECODER),yes)
193 - OBJS+= idcinvideo.o
194 + OBJS+= idcinvideo.lo
196 ifeq ($(CONFIG_INDEO2_DECODER),yes)
200 ifeq ($(CONFIG_INDEO3_DECODER),yes)
204 ifeq ($(CONFIG_INTERPLAY_VIDEO_DECODER),yes)
205 - OBJS+= interplayvideo.o
206 + OBJS+= interplayvideo.lo
208 ifneq ($(CONFIG_MSZH_DECODER)$(CONFIG_ZLIB_DECODER)$(CONFIG_ZLIB_ENCODER),)
212 ifeq ($(CONFIG_LOCO_DECODER),yes)
216 ifneq ($(CONFIG_MACE3_DECODER)$(CONFIG_MACE6_DECODER),)
220 ifeq ($(CONFIG_MSRLE_DECODER),yes)
224 ifeq ($(CONFIG_MSVIDEO1_DECODER),yes)
228 ifneq ($(CONFIG_PNG_DECODER)$(CONFIG_PNG_ENCODER),)
232 ifeq ($(CONFIG_QDM2_DECODER),yes)
236 ifeq ($(CONFIG_QDRAW_DECODER),yes)
240 ifeq ($(CONFIG_QPEG_DECODER),yes)
244 ifeq ($(CONFIG_QTRLE_DECODER),yes)
248 ifeq ($(CONFIG_RA_144_DECODER),yes)
252 ifeq ($(CONFIG_RA_288_DECODER),yes)
256 ifeq ($(CONFIG_ROQ_DECODER),yes)
260 ifeq ($(CONFIG_RPZA_DECODER),yes)
264 ifneq ($(CONFIG_RV10_DECODER)$(CONFIG_RV20_DECODER)$(CONFIG_RV10_ENCODER)$(CONFIG_RV20_ENCODER),)
268 ifeq ($(CONFIG_SHORTEN_DECODER),yes)
272 ifeq ($(CONFIG_SMC_DECODER),yes)
276 ifneq ($(CONFIG_SNOW_DECODER)$(CONFIG_SNOW_ENCODER),)
280 ifneq ($(CONFIG_SONIC_DECODER)$(CONFIG_SONIC_ENCODER)$(CONFIG_SONIC_LS_ENCODER),)
284 ifneq ($(CONFIG_SVQ1_DECODER)$(CONFIG_SVQ1_ENCODER),)
288 ifeq ($(CONFIG_TRUEMOTION1_DECODER),yes)
289 - OBJS+= truemotion1.o
290 + OBJS+= truemotion1.lo
292 ifeq ($(CONFIG_TRUEMOTION2_DECODER),yes)
293 - OBJS+= truemotion2.o
294 + OBJS+= truemotion2.lo
296 ifeq ($(CONFIG_TRUESPEECH_DECODER),yes)
297 - OBJS+= truespeech.o
298 + OBJS+= truespeech.lo
300 ifeq ($(CONFIG_TSCC_DECODER),yes)
304 ifeq ($(CONFIG_CSCD_DECODER),yes)
310 ifeq ($(CONFIG_ULTI_DECODER),yes)
314 ifneq ($(CONFIG_VC9_DECODER)$(CONFIG_WMV3_DECODER),)
318 ifneq ($(CONFIG_VCR1_DECODER)$(CONFIG_VCR1_ENCODER),)
322 ifneq ($(CONFIG_VMDVIDEO_DECODER)$(CONFIG_VMDAUDIO_DECODER),)
326 ifeq ($(CONFIG_VORBIS_DECODER),yes)
330 ifneq ($(CONFIG_VP3_DECODER)$(CONFIG_THEORA_DECODER),)
334 ifeq ($(CONFIG_VQA_DECODER),yes)
338 ifneq ($(CONFIG_WMAV1_DECODER)$(CONFIG_WMAV2_DECODER),)
342 ifeq ($(CONFIG_WNV1_DECODER),yes)
346 ifeq ($(CONFIG_WS_SND1_DECODER),yes)
350 ifneq ($(CONFIG_XAN_WC3_DECODER)$(CONFIG_XAN_WC4_DECODER),)
354 ifeq ($(CONFIG_XL_DECODER),yes)
358 ifeq ($(CONFIG_BMP_DECODER),yes)
365 ifeq ($(AMR_NB_FIXED),yes)
367 -AMREXTRALIBS+= amr/*.o
369 +AMREXTRALIBS+= amr/*.lo
374 -OBJS+= amr_float/sp_dec.o amr_float/sp_enc.o amr_float/interf_dec.o amr_float/interf_enc.o
376 +OBJS+= amr_float/sp_dec.lo amr_float/sp_enc.lo amr_float/interf_dec.lo amr_float/interf_enc.lo
377 CLEANAMR=cleanamrfloat
381 ifeq ($(HAVE_PTHREADS),yes)
386 ifeq ($(HAVE_W32THREADS),yes)
391 ifeq ($(HAVE_BEOSTHREADS),yes)
393 +OBJS+= beosthread.lo
398 -OBJS+= amrwb_float/dec_acelp.o amrwb_float/dec_dtx.o amrwb_float/dec_gain.o \
399 - amrwb_float/dec_if.o amrwb_float/dec_lpc.o amrwb_float/dec_main.o \
400 - amrwb_float/dec_rom.o amrwb_float/dec_util.o amrwb_float/enc_acelp.o \
401 - amrwb_float/enc_dtx.o amrwb_float/enc_gain.o amrwb_float/enc_if.o \
402 - amrwb_float/enc_lpc.o amrwb_float/enc_main.o amrwb_float/enc_rom.o \
403 - amrwb_float/enc_util.o amrwb_float/if_rom.o
405 +OBJS+= amrwb_float/dec_acelp.lo amrwb_float/dec_dtx.lo amrwb_float/dec_gain.lo \
406 + amrwb_float/dec_if.lo amrwb_float/dec_lpc.lo amrwb_float/dec_main.lo \
407 + amrwb_float/dec_rom.lo amrwb_float/dec_util.lo amrwb_float/enc_acelp.lo \
408 + amrwb_float/enc_dtx.lo amrwb_float/enc_gain.lo amrwb_float/enc_if.lo \
409 + amrwb_float/enc_lpc.lo amrwb_float/enc_main.lo amrwb_float/enc_rom.lo \
410 + amrwb_float/enc_util.lo amrwb_float/if_rom.lo
413 CLEANAMRWB=cleanamrwbfloat
416 ifeq ($(HAVE_XVMC_ACCEL),yes)
421 # currently using liba52 for ac3 decoding
422 ifeq ($(CONFIG_AC3),yes)
426 # using builtin liba52 or runtime linked liba52.so.0
427 ifneq ($(CONFIG_A52BIN),yes)
428 -OBJS+= liba52/bit_allocate.o liba52/bitstream.o liba52/downmix.o \
429 - liba52/imdct.o liba52/parse.o liba52/crc.o liba52/resample.o
430 +OBJS+= liba52/bit_allocate.lo liba52/bitstream.lo liba52/downmix.lo \
431 + liba52/imdct.lo liba52/parse.lo liba52/crc.lo liba52/resample.lo
435 -EXTRALIBS += -L../libavutil -lavutil$(BUILDSUF)
436 +EXTRALIBS += $(SRC_PATH)/libavutil/libavutil.la
438 # currently using libdts for dts decoding
439 ifeq ($(CONFIG_DTS),yes)
445 ifeq ($(CONFIG_FAAD),yes)
450 ifeq ($(CONFIG_FAAC),yes)
455 ifeq ($(CONFIG_XVID),yes)
462 ifeq ($(CONFIG_X264),yes)
467 ifeq ($(CONFIG_PP),yes)
468 ifeq ($(BUILD_SHARED),yes)
469 -EXTRALIBS += -Llibpostproc -lpostproc$(BUILDSUF)
470 +EXTRALIBS += libpostproc/libpostproc.la
471 +EXTRADEPS += libpostproc/libpostproc.la
473 # LIBS += libpostproc/libpostproc.a ... should be fixed
474 -OBJS += libpostproc/postprocess.o
475 +OBJS += libpostproc/postprocess.lo
479 ifeq ($(CONFIG_MP3LAME),yes)
480 -OBJS += mp3lameaudio.o
481 +OBJS += mp3lameaudio.lo
484 ifeq ($(CONFIG_LIBOGG),yes)
485 ifeq ($(CONFIG_LIBVORBIS),yes)
487 +OBJS += oggvorbis.lo
489 ifeq ($(CONFIG_LIBTHEORA), yes)
491 +OBJS += oggtheora.lo
495 ifeq ($(CONFIG_LIBGSM),yes)
500 ifeq ($(TARGET_GPROF),yes)
501 @@ -323,33 +324,33 @@
503 # i386 mmx specific stuff
504 ifeq ($(TARGET_MMX),yes)
505 -OBJS += i386/fdct_mmx.o i386/cputest.o \
506 - i386/dsputil_mmx.o i386/mpegvideo_mmx.o \
507 - i386/idct_mmx.o i386/motion_est_mmx.o \
508 - i386/simple_idct_mmx.o i386/fft_sse.o i386/vp3dsp_mmx.o \
510 +OBJS += i386/fdct_mmx.lo i386/cputest.lo \
511 + i386/dsputil_mmx.lo i386/mpegvideo_mmx.lo \
512 + i386/idct_mmx.lo i386/motion_est_mmx.lo \
513 + i386/simple_idct_mmx.lo i386/fft_sse.lo i386/vp3dsp_mmx.lo \
514 + i386/vp3dsp_sse2.lo
515 ifeq ($(CONFIG_GPL),yes)
516 -OBJS += i386/idct_mmx_xvid.o
517 +OBJS += i386/idct_mmx_xvid.lo
519 ifdef TARGET_BUILTIN_VECTOR
520 -i386/fft_sse.o: CFLAGS+= -msse
521 +i386/fft_sse.lo: CFLAGS+= -msse
522 depend: CFLAGS+= -msse
526 # armv4l specific stuff
527 ifeq ($(TARGET_ARCH_ARMV4L),yes)
528 -ASM_OBJS += armv4l/jrevdct_arm.o armv4l/simple_idct_arm.o armv4l/dsputil_arm_s.o
529 -OBJS += armv4l/dsputil_arm.o armv4l/mpegvideo_arm.o
530 +ASM_OBJS += armv4l/jrevdct_arm.lo armv4l/simple_idct_arm.lo armv4l/dsputil_arm_s.lo
531 +OBJS += armv4l/dsputil_arm.lo armv4l/mpegvideo_arm.lo
532 ifeq ($(TARGET_IWMMXT),yes)
533 -OBJS += armv4l/dsputil_iwmmxt.o armv4l/mpegvideo_iwmmxt.o
534 +OBJS += armv4l/dsputil_iwmmxt.lo armv4l/mpegvideo_iwmmxt.lo
538 # sun mediaLib specific stuff
539 # currently only works when libavcodec is used in mplayer
540 ifeq ($(HAVE_MLIB),yes)
541 -OBJS += mlib/dsputil_mlib.o
542 +OBJS += mlib/dsputil_mlib.lo
543 CFLAGS += $(MLIB_INC)
546 @@ -361,83 +362,73 @@
548 # alpha specific stuff
549 ifeq ($(TARGET_ARCH_ALPHA),yes)
550 -OBJS += alpha/dsputil_alpha.o alpha/mpegvideo_alpha.o \
551 - alpha/simple_idct_alpha.o alpha/motion_est_alpha.o
552 -ASM_OBJS += alpha/dsputil_alpha_asm.o alpha/motion_est_mvi_asm.o
553 +OBJS += alpha/dsputil_alpha.lo alpha/mpegvideo_alpha.lo \
554 + alpha/simple_idct_alpha.lo alpha/motion_est_alpha.lo
555 +ASM_OBJS += alpha/dsputil_alpha_asm.lo alpha/motion_est_mvi_asm.lo
556 CFLAGS += -fforce-addr
559 ifeq ($(TARGET_ARCH_POWERPC),yes)
560 -OBJS += ppc/dsputil_ppc.o ppc/mpegvideo_ppc.o
561 +OBJS += ppc/dsputil_ppc.lo ppc/mpegvideo_ppc.lo
564 ifeq ($(TARGET_MMI),yes)
565 -OBJS += ps2/dsputil_mmi.o ps2/idct_mmi.o ps2/mpegvideo_mmi.o
566 +OBJS += ps2/dsputil_mmi.lo ps2/idct_mmi.lo ps2/mpegvideo_mmi.lo
569 ifeq ($(TARGET_ALTIVEC),yes)
570 -OBJS += ppc/dsputil_altivec.o ppc/mpegvideo_altivec.o ppc/idct_altivec.o \
571 - ppc/fft_altivec.o ppc/gmc_altivec.o ppc/fdct_altivec.o \
572 - ppc/dsputil_h264_altivec.o
573 +OBJS += ppc/dsputil_altivec.lo ppc/mpegvideo_altivec.lo ppc/idct_altivec.lo \
574 + ppc/fft_altivec.lo ppc/gmc_altivec.lo ppc/fdct_altivec.lo \
575 + ppc/dsputil_h264_altivec.lo
578 ifeq ($(TARGET_ARCH_SH4),yes)
579 -OBJS+= sh4/idct_sh4.o sh4/dsputil_sh4.o sh4/dsputil_align.o
580 +OBJS+= sh4/idct_sh4.lo sh4/dsputil_sh4.lo sh4/dsputil_align.lo
583 ifeq ($(TARGET_ARCH_SPARC),yes)
584 -OBJS+=sparc/dsputil_vis.o
585 -sparc/%.o: sparc/%.c
586 - $(CC) -mcpu=ultrasparc -mtune=ultrasparc $(CFLAGS) -c -o $@ $<
587 +OBJS+=sparc/dsputil_vis.lo
588 +sparc/%.lo: sparc/%.c
589 + libtool --mode=compile --tag=CC $(CC) -mcpu=ultrasparc -mtune=ultrasparc $(CFLAGS) -c -o $@ $<
591 ifeq ($(TARGET_ARCH_SPARC64),yes)
592 CFLAGS+= -mcpu=ultrasparc -mtune=ultrasparc
595 -SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S)
596 +SRCS := $(OBJS:.lo=.c) $(ASM_OBJS:.lo=.S)
597 OBJS := $(OBJS) $(ASM_OBJS)
600 -LIBAVUTIL= $(SRC_PATH)/libavutil/$(LIBPREF)avutil$(LIBSUF)
601 -ifeq ($(BUILD_SHARED),yes)
602 +LIBAVUTIL= $(SRC_PATH)/libavutil/libavutil.la
603 LIBVERSION=$(LAVCVERSION)
604 LIBMAJOR=$(LAVCMAJOR)
605 +ifeq ($(BUILD_SHARED),yes)
606 +RPATH= -rpath $(libdir)
610 TESTS= imgresample-test dct-test motion-test fft-test
612 -all: $(LIB) $(SLIBNAME)
616 $(MAKE) -C amr spclib fipoplib
618 tests: apiexample cpuid_test $(TESTS)
620 -$(LIB): $(OBJS) $(AMRLIBS)
622 - $(AR) rc $@ $(OBJS) $(AMREXTRALIBS)
625 -$(SLIBNAME): $(OBJS)
626 -ifeq ($(CONFIG_PP),yes)
627 - $(MAKE) -C libpostproc
629 -ifeq ($(CONFIG_WIN32),yes)
630 - $(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS)
631 - -lib /machine:i386 /def:$(@:.dll=.def)
633 - $(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS)
635 +$(LIB): $(OBJS) $(AMRLIBS) $(EXTRADEPS)
636 + libtool --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $(OBJS) $(AMREXTRALIBS) $(RPATH) $(EXTRALIBS) -version-number `echo $(LIBVERSION) | tr . :`
638 -dsputil.o: dsputil.c dsputil.h
639 +dsputil.lo: dsputil.c dsputil.h
641 -libpostproc/libpostproc.a:
642 +libpostproc/libpostproc.la:
643 $(MAKE) -C libpostproc
646 - $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
648 + libtool --mode=compile --tag=CC $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
651 - $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
653 + libtool --mode=compile --tag=CC $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
656 $(CC) -MM $(CFLAGS) $^ 1>.depend
659 # api example program
660 apiexample: apiexample.c $(LIB)
661 - $(CC) $(CFLAGS) -o $@ $< $(LIB) $(LIBAVUTIL) $(EXTRALIBS) -lm
662 + libtool --mode=link --tag=CC $(CC) $(CFLAGS) -o $@ $< $(LIB) $(LIBAVUTIL) $(EXTRALIBS) -lm
665 cpuid_test: i386/cputest.c
666 @@ -485,46 +476,32 @@
667 $(CC) $(CFLAGS) -DTEST -o $@ $^ -lm
669 dct-test: dct-test.o fdctref.o $(LIB)
670 - $(CC) -o $@ $^ -lm $(LIBAVUTIL)
671 + libtool --mode=link --tag=CC $(CC) -o $@ $^ -lm $(LIBAVUTIL)
673 motion-test: motion_test.o $(LIB)
675 + libtool --mode=link --tag=CC $(CC) -o $@ $^ -lm
677 fft-test: fft-test.o $(LIB)
678 - $(CC) -o $@ $^ $(LIBAVUTIL) -lm
679 + libtool --mode=link --tag=CC $(CC) -o $@ $^ $(LIBAVUTIL) -lm
681 -ifeq ($(BUILD_SHARED),yes)
682 install: all install-headers
683 -ifeq ($(CONFIG_WIN32),yes)
684 - install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)"
686 - install -d $(libdir)
687 - install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \
688 - $(libdir)/$(SLIBNAME_WITH_VERSION)
689 - ln -sf $(SLIBNAME_WITH_VERSION) \
690 - $(libdir)/$(SLIBNAME_WITH_MAJOR)
691 - ln -sf $(SLIBNAME_WITH_VERSION) \
692 - $(libdir)/$(SLIBNAME)
693 - $(LDCONFIG) || true
695 ifeq ($(CONFIG_PP),yes)
696 $(MAKE) -C libpostproc $@
701 + install -d $(DESTDIR)$(libdir)
702 + libtool --mode=install install $(INSTALLSTRIP) $(LIB) $(DESTDIR)$(libdir)
704 installlib: all install-headers
705 - install -m 644 $(LIB) "$(libdir)"
706 + libtool --mode=install install -m 644 $(LIB) "$(DESTDIR)$(libdir)"
709 - mkdir -p "$(prefix)/include/ffmpeg"
710 + install -d "$(DESTDIR)$(prefix)/include/ffmpeg"
711 install -m 644 $(SRC_PATH)/libavcodec/avcodec.h \
712 - "$(prefix)/include/ffmpeg"
713 + "$(DESTDIR)$(prefix)/include/ffmpeg"
714 install -m 644 $(SRC_PATH)/libavcodec/dsputil.h \
715 - "$(prefix)/include/ffmpeg"
716 - install -d "$(libdir)/pkgconfig"
717 - install -m 644 ../libavcodec.pc "$(libdir)/pkgconfig"
718 + "$(DESTDIR)$(prefix)/include/ffmpeg"
719 + install -d "$(DESTDIR)$(libdir)/pkgconfig"
720 + install -m 644 ../libavcodec.pc "$(DESTDIR)$(libdir)/pkgconfig"
723 # include dependency files if they exist
724 --- ffmpeg/libavformat/Makefile.orig 2006-01-27 00:42:29.000000000 +0100
725 +++ ffmpeg/libavformat/Makefile 2006-01-29 13:58:17.064047000 +0100
728 CFLAGS=$(OPTFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavutil -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
730 -OBJS= utils.o cutils.o os_support.o allformats.o
731 +OBJS= utils.lo cutils.lo os_support.lo allformats.lo
735 -OBJS+=mpeg.o mpegts.o mpegtsenc.o ffm.o crc.o img.o img2.o raw.o rm.o \
736 - avienc.o avidec.o wav.o mmf.o swf.o au.o gif.o mov.o mpjpeg.o dv.o \
737 - yuv4mpeg.o 4xm.o flvdec.o psxstr.o idroq.o ipmovie.o \
738 - nut.o wc3movie.o mp3.o westwood.o segafilm.o idcin.o flic.o \
739 - sierravmd.o matroska.o sol.o electronicarts.o nsvdec.o asf.o \
740 - ogg2.o oggparsevorbis.o oggparsetheora.o oggparseflac.o daud.o
741 +OBJS+=mpeg.lo mpegts.lo mpegtsenc.lo ffm.lo crc.lo img.lo img2.lo raw.lo rm.lo \
742 + avienc.lo avidec.lo wav.lo mmf.lo swf.lo au.lo gif.lo mov.lo mpjpeg.lo dv.lo \
743 + yuv4mpeg.lo 4xm.lo flvdec.lo psxstr.lo idroq.lo ipmovie.lo \
744 + nut.lo wc3movie.lo mp3.lo westwood.lo segafilm.lo idcin.lo flic.lo \
745 + sierravmd.lo matroska.lo sol.lo electronicarts.lo nsvdec.lo asf.lo \
746 + ogg2.lo oggparsevorbis.lo oggparsetheora.lo oggparseflac.lo daud.lo
749 ifeq ($(CONFIG_MUXERS),yes)
750 -OBJS+= flvenc.o movenc.o asf-enc.o
751 +OBJS+= flvenc.lo movenc.lo asf-enc.lo
760 ifeq ($(AMR_NB_FIXED),yes)
771 -OBJS+= pnm.o yuv.o png.o jpeg.o gifdec.o sgi.o
773 +OBJS+= pnm.lo yuv.lo png.lo jpeg.lo gifdec.lo sgi.lo
776 ifeq ($(CONFIG_VIDEO4LINUX),yes)
781 ifeq ($(CONFIG_BKTR),yes)
786 ifeq ($(CONFIG_DV1394),yes)
791 ifeq ($(CONFIG_DC1394),yes)
796 ifeq ($(CONFIG_AUDIO_OSS),yes)
801 -EXTRALIBS += -L../libavutil -lavutil$(BUILDSUF)
802 +EXTRALIBS += ../libavutil/libavutil.la
804 ifeq ($(CONFIG_AUDIO_BEOS),yes)
805 -PPOBJS+= beosaudio.o
806 +PPOBJS+= beosaudio.lo
810 -OBJS+= avio.o aviobuf.o
811 +OBJS+= avio.lo aviobuf.lo
813 ifeq ($(CONFIG_PROTOCOLS),yes)
816 ifeq ($(CONFIG_NETWORK),yes)
817 -OBJS+= udp.o tcp.o http.o rtsp.o rtp.o rtpproto.o
818 +OBJS+= udp.lo tcp.lo http.lo rtsp.lo rtp.lo rtpproto.lo
819 # BeOS and Darwin network stuff
820 ifeq ($(NEED_INET_ATON),yes)
827 ifeq ($(CONFIG_LIBOGG),yes)
832 ifeq ($(TARGET_ARCH_SPARC64),yes)
837 -ifeq ($(BUILD_SHARED),yes)
838 LIBVERSION=$(LAVFVERSION)
839 LIBMAJOR=$(LAVFMAJOR)
840 -AVCLIBS+=-lavcodec$(BUILDSUF) -L../libavcodec -lavutil$(BUILDSUF) -L../libavutil
841 +ifeq ($(BUILD_SHARED),yes)
842 +RPATH= -rpath $(libdir)
846 +AVCLIBS+=../libavcodec/libavcodec.la ../libavutil/libavutil.la
848 -SRCS := $(OBJS:.o=.c) $(PPOBJS:.o=.cpp)
849 +SRCS := $(OBJS:.lo=.c) $(PPOBJS:.lo=.cpp)
851 -all: $(LIB) $(SLIBNAME)
854 $(LIB): $(OBJS) $(PPOBJS)
856 - $(AR) rc $@ $(OBJS) $(PPOBJS)
859 -$(SLIBNAME): $(OBJS)
860 -ifeq ($(CONFIG_WIN32),yes)
861 - $(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(PPOBJS) $(AVCLIBS) $(EXTRALIBS)
862 - -lib /machine:i386 /def:$(@:.dll=.def)
864 - $(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(PPOBJS) $(AVCLIBS) $(EXTRALIBS)
865 + libtool --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $(OBJS) $(PPOBJS) $(AVCLIBS) $(EXTRALIBS) $(RPATH) -version-number `echo $(LIBVERSION) | tr . :`
869 $(CC) -MM $(CFLAGS) $^ 1>.depend
871 -ifeq ($(BUILD_SHARED),yes)
872 install: all install-headers
873 -ifeq ($(CONFIG_WIN32),yes)
874 - install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)"
876 - install -d $(libdir)
877 - install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \
878 - $(libdir)/$(SLIBNAME_WITH_VERSION)
879 - ln -sf $(SLIBNAME_WITH_VERSION) \
880 - $(libdir)/$(SLIBNAME_WITH_MAJOR)
881 - ln -sf $(SLIBNAME_WITH_VERSION) \
882 - $(libdir)/$(SLIBNAME)
883 - $(LDCONFIG) || true
888 + install -d $(DESTDIR)$(libdir)
889 + libtool --mode=install install $(INSTALLSTRIP) $(LIB) $(DESTDIR)$(libdir)
891 installlib: all install-headers
892 - install -m 644 $(LIB) "$(libdir)"
893 + libtool --mode=install install $(LIB) "$(DESTDIR)$(libdir)"
896 - mkdir -p "$(prefix)/include/ffmpeg"
897 + install -d "$(DESTDIR)$(prefix)/include/ffmpeg"
898 install -m 644 $(SRC_PATH)/libavformat/avformat.h $(SRC_PATH)/libavformat/avio.h \
899 $(SRC_PATH)/libavformat/rtp.h $(SRC_PATH)/libavformat/rtsp.h \
900 $(SRC_PATH)/libavformat/rtspcodes.h \
901 - "$(prefix)/include/ffmpeg"
902 - install -d "$(libdir)/pkgconfig"
903 - install -m 644 ../libavformat.pc "$(libdir)/pkgconfig"
904 + "$(DESTDIR)$(prefix)/include/ffmpeg"
905 + install -d "$(DESTDIR)$(libdir)/pkgconfig"
906 + install -m 644 ../libavformat.pc "$(DESTDIR)$(libdir)/pkgconfig"
909 - $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
911 + libtool --mode=compile --tag=CC $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
913 # BeOS: remove -Wall to get rid of all the "multibyte constant" warnings
915 - g++ $(subst -Wall,,$(CFLAGS)) -c -o $@ $<
917 + libtool --mode=compile --tag=CXX g++ $(subst -Wall,,$(CFLAGS)) -c -o $@ $<
920 rm -f *.o *.d *~ *.a *.lib *.so *.dylib *.dll
921 --- ffmpeg/libavutil/Makefile.orig 2006-01-27 00:42:29.000000000 +0100
922 +++ ffmpeg/libavutil/Makefile 2006-01-29 14:10:15.400940250 +0100
924 # NOTE: -I.. is needed to include config.h
925 CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
927 -OBJS= mathematics.o \
930 - intfloat_readwrite.o \
931 +OBJS= mathematics.lo \
934 + intfloat_readwrite.lo \
937 ifeq ($(TARGET_ARCH_SPARC64),yes)
938 CFLAGS+= -mcpu=ultrasparc -mtune=ultrasparc
941 -SRCS := $(OBJS:.o=.c)
942 +SRCS := $(OBJS:.lo=.c)
945 -ifeq ($(BUILD_SHARED),yes)
946 LIBVERSION=$(LAVUVERSION)
947 LIBMAJOR=$(LAVUMAJOR)
948 +ifeq ($(BUILD_SHARED),yes)
949 +RPATH=-rpath $(libdir)
954 -all: $(LIB) $(SLIBNAME)
959 - $(AR) rc $@ $(OBJS)
962 -$(SLIBNAME): $(OBJS)
963 -ifeq ($(CONFIG_WIN32),yes)
964 - $(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS)
965 - -lib /machine:i386 /def:$(@:.dll=.def)
967 - $(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS)
969 + libtool --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) $(LDFLAGS) $(RPATH) -version-number `echo $(LIBVERSION) | tr . :`
972 - $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
974 + libtool --mode=compile --tag=CC $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
977 $(CC) -MM $(CFLAGS) $^ 1>.depend
982 -ifeq ($(BUILD_SHARED),yes)
983 install: all install-headers
984 -ifeq ($(CONFIG_WIN32),yes)
985 - install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)"
987 - install -d $(libdir)
988 - install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \
989 - $(libdir)/$(SLIBNAME_WITH_VERSION)
990 - ln -sf $(SLIBNAME_WITH_VERSION) \
991 - $(libdir)/$(SLIBNAME_WITH_MAJOR)
992 - ln -sf $(SLIBNAME_WITH_VERSION) \
993 - $(libdir)/$(SLIBNAME)
994 - $(LDCONFIG) || true
999 + install -d $(DESTDIR)$(libdir)
1000 + libtool --mode=install install $(INSTALLSTRIP) $(LIB) $(DESTDIR)$(libdir)
1002 installlib: all install-headers
1003 - install -m 644 $(LIB) "$(libdir)"
1004 + libtool --mode=install install $(LIB) "$(DESTDIR)$(libdir)"
1007 - mkdir -p "$(prefix)/include/ffmpeg"
1008 + install -d "$(DESTDIR)$(prefix)/include/ffmpeg"
1009 install -m 644 $(SRC_PATH)/libavutil/avutil.h \
1010 $(SRC_PATH)/libavutil/common.h \
1011 $(SRC_PATH)/libavutil/mathematics.h \
1012 $(SRC_PATH)/libavutil/integer.h \
1013 $(SRC_PATH)/libavutil/rational.h \
1014 $(SRC_PATH)/libavutil/intfloat_readwrite.h \
1015 - "$(prefix)/include/ffmpeg"
1016 - install -d "$(libdir)/pkgconfig"
1017 - install -m 644 ../libavutil.pc "$(libdir)/pkgconfig"
1018 + "$(DESTDIR)$(prefix)/include/ffmpeg"
1019 + install -d "$(DESTDIR)$(libdir)/pkgconfig"
1020 + install -m 644 ../libavutil.pc "$(DESTDIR)$(libdir)/pkgconfig"
1023 # include dependency files if they exist
1024 --- ffmpeg/vhook/Makefile.orig 2006-01-27 00:42:30.000000000 +0100
1025 +++ ffmpeg/vhook/Makefile 2006-01-29 14:11:18.492883250 +0100
1027 $(CC) -MM $(CFLAGS) $^ 1>.depend
1030 - install -d "$(libdir)/vhook"
1031 - install -m 755 $(HOOKS) "$(libdir)/vhook"
1032 + install -d "$(DESTDIR)$(libdir)/vhook"
1033 + install -m 755 $(HOOKS) "$(DESTDIR)$(libdir)/vhook"
1035 imlib2$(SLIBSUF): imlib2.o
1036 - $(CC) $(LDFLAGS) -g -o $@ $(SHFLAGS) $< -lImlib2
1037 + $(CC) $(LDFLAGS) -o $@ $(SHFLAGS) $< -lImlib2
1039 drawtext$(SLIBSUF): drawtext.o
1040 - $(CC) $(LDFLAGS) -g -o $@ $(SHFLAGS) $< `freetype-config --libs`
1041 + $(CC) $(LDFLAGS) -o $@ $(SHFLAGS) $< `freetype-config --libs`
1044 - $(CC) $(LDFLAGS) -g -o $@ $(SHFLAGS) $<
1045 + $(CC) $(LDFLAGS) -o $@ $(SHFLAGS) $<
1048 rm -f *.o *.d *~ *.a *.lib *.so *.dylib *.dll
1049 --- ffmpeg/Makefile.orig 2006-01-27 00:42:27.000000000 +0100
1050 +++ ffmpeg/Makefile 2006-01-29 14:14:13.291807500 +0100
1054 CFLAGS=$(OPTFLAGS) -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavutil -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
1057 ifeq ($(TARGET_GPROF),yes)
1060 EXTRALIBS+=-lmedia -lbe
1063 -ifeq ($(BUILD_SHARED),yes)
1064 -DEP_LIBS=libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) libavformat/$(SLIBPREF)avformat$(SLIBSUF)
1066 -DEP_LIBS=libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF)
1068 +DEP_LIBS=libavcodec/libavcodec.la libavformat/libavformat.la
1070 ifeq ($(BUILD_VHOOK),yes)
1074 OBJS = ffmpeg.o ffserver.o cmdutils.o $(FFPLAY_O)
1075 SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s)
1076 -FFLIBS = -L./libavformat -lavformat$(BUILDSUF) -L./libavcodec -lavcodec$(BUILDSUF) -L./libavutil -lavutil$(BUILDSUF)
1077 +FFLIBS = libavformat/libavformat.la libavcodec/libavcodec.la libavutil/libavutil.la
1079 -all: lib $(PROG_G) $(PROG) $(PROGTEST) $(VHOOK) $(QTFASTSTART) $(DOC)
1080 +all: lib $(PROG) $(PROGTEST) $(VHOOK) $(QTFASTSTART) $(DOC)
1083 $(MAKE) -C libavcodec all
1084 $(MAKE) -C libavformat all
1086 -ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs
1087 - $(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(FFLIBS) $(EXTRALIBS)
1089 -ffmpeg$(EXESUF): ffmpeg_g$(EXESUF)
1092 +ffmpeg$(EXESUF): ffmpeg.o cmdutils.o
1093 + libtool --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(FFLIBS) $(EXTRALIBS)
1095 -ffserver$(EXESUF): ffserver.o .libs
1096 - $(CC) $(LDFLAGS) $(FFSLDFLAGS) -o $@ ffserver.o $(FFLIBS) $(EXTRALIBS)
1097 +ffserver$(EXESUF): ffserver.o
1098 + libtool --mode=link --tag=CC $(CC) $(LDFLAGS) $(FFSLDFLAGS) -o $@ ffserver.o $(FFLIBS) $(EXTRALIBS)
1100 -ffplay_g$(EXESUF): ffplay.o cmdutils.o .libs
1101 - $(CC) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(FFLIBS) $(EXTRALIBS) $(SDL_LIBS)
1102 +ffplay$(EXESUF): ffplay.o cmdutils.o
1103 + libtool --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(FFLIBS) $(EXTRALIBS) $(SDL_LIBS)
1105 -ffplay$(EXESUF): ffplay_g$(EXESUF)
1109 -output_example$(EXESUF): output_example.o .libs
1110 - $(CC) $(LDFLAGS) -o $@ output_example.o $(FFLIBS) $(EXTRALIBS)
1111 +output_example$(EXESUF): output_example.o
1112 + libtool --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ output_example.o $(FFLIBS) $(EXTRALIBS)
1114 qt-faststart$(EXESUF): qt-faststart.c
1115 $(CC) $(SRC_PATH)/qt-faststart.c -o qt-faststart$(EXESUF)
1118 $(CC) $(CFLAGS) -c -o $@ $<
1122 $(MAKE) -C vhook all
1126 $(MAKE) -C libavutil install
1127 $(MAKE) -C libavcodec install
1128 $(MAKE) -C libavformat install
1129 - install -d "$(bindir)"
1130 - install -c $(INSTALLSTRIP) -m 755 $(PROG) "$(bindir)"
1131 + install -d "$(DESTDIR)$(bindir)"
1132 + libtool --mode=install install -c $(INSTALLSTRIP) $(PROG) "$(DESTDIR)$(bindir)"
1134 # create the window installer
1135 wininstaller: all install
1138 ifneq ($(CONFIG_WIN32),yes)
1139 if [ -f doc/ffmpeg.1 ] ; then \
1140 - install -d "$(mandir)/man1" ; \
1141 - install -m 644 $(MANPAGE) "$(mandir)/man1" ; \
1142 + install -d "$(DESTDIR)$(mandir)/man1" ; \
1143 + install -m 644 $(MANPAGE) "$(DESTDIR)$(mandir)/man1" ; \
1147 @@ -148,17 +135,13 @@
1149 $(CC) -MM $(CFLAGS) $(SDL_CFLAGS) $^ 1>.depend
1152 - @test -f .libs || touch .libs
1153 - @for i in $(DEP_LIBS) ; do if $(TEST) $$i -nt .libs ; then touch .libs; fi ; done
1156 $(MAKE) -C libavutil clean
1157 $(MAKE) -C libavcodec clean
1158 $(MAKE) -C libavformat clean
1159 $(MAKE) -C tests clean
1160 $(MAKE) -C vhook clean
1161 - rm -f *.o *.d *~ .libs gmon.out TAGS \
1162 + rm -f *.o *.d *~ gmon.out TAGS \
1163 $(PROG) $(PROG_G) $(PROGTEST) $(QTFASTSTART)
1165 # Note well: config.log is NOT removed.
1166 --- ffmpeg/configure.orig 2006-01-24 20:57:41.000000000 +0100
1167 +++ ffmpeg/configure 2006-01-29 14:17:56.061729750 +0100
1168 @@ -232,10 +232,10 @@
1172 -LIB='$(LIBPREF)$(NAME)$(LIBSUF)'
1173 +LIB='$(LIBPREF)$(NAME).la'
1176 -SLIBNAME='$(SLIBPREF)$(NAME)$(SLIBSUF)'
1177 +SLIBNAME='$(SLIBPREF)$(NAME).la'
1178 SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME)$(SLIBSUF).$(LIBVERSION)'
1179 SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME)$(SLIBSUF).$(LIBMAJOR)'
1181 @@ -1331,10 +1331,10 @@
1182 echo "/* Automatically generated by configure - do not modify! */" > $TMPH
1183 echo "#define FFMPEG_CONFIGURATION "'"'"$FFMPEG_CONFIGURATION"'"' >> $TMPH
1185 -echo "prefix=\$(DESTDIR)$prefix" >> config.mak
1186 -echo "libdir=\$(DESTDIR)$libdir" >> config.mak
1187 -echo "bindir=\$(DESTDIR)$bindir" >> config.mak
1188 -echo "mandir=\$(DESTDIR)$mandir" >> config.mak
1189 +echo "prefix=$prefix" >> config.mak
1190 +echo "libdir=$libdir" >> config.mak
1191 +echo "bindir=$bindir" >> config.mak
1192 +echo "mandir=$mandir" >> config.mak
1193 echo "MAKE=$make" >> config.mak
1194 echo "CC=$cc" >> config.mak
1195 echo "AR=$ar" >> config.mak