# HG changeset patch # User rtognimp # Date 1104362262 0 # Node ID 996fe7d787015532cb774ab8b63eba262a584555 # Parent 8909a59c946104c284ca19b3c1e855b361a28beb Fix compilation when both amr_nb and amr_wb are enabled diff -r 8909a59c9461 -r 996fe7d78701 Makefile --- a/Makefile Wed Dec 29 18:31:28 2004 +0000 +++ b/Makefile Wed Dec 29 23:17:42 2004 +0000 @@ -23,15 +23,17 @@ OBJS+= asf-enc.o endif +AMROBJS= ifeq ($(AMR_NB),yes) -OBJS+= amr.o +AMROBJS= amr.o endif ifeq ($(AMR_NB_FIXED),yes) -OBJS+= amr.o +AMROBJS= amr.o endif ifeq ($(AMR_WB),yes) -OBJS+= amr.o +AMROBJS= amr.o endif +OBJS+= $(AMROBJS) # image formats OBJS+= pnm.o yuv.o png.o jpeg.o gifdec.o sgi.o