head	1.6;
access;
symbols
	Distribution_06:1.5
	IRT_02:1.4.2.1
	Philips_01:1.4.1.1
	D6Base:1.4
	Distribution_05:1.4
	Distribution_04:1.4
	Distribution_03:1.4
	Samsung_01:1.3
	IRT_01:1.3
	TI_01:1.3.1.4
	Distribution_01a:1.4
	Distribution_02:1.4
	Distribution_00:1.1
	Distribution_01:1.3;
locks; strict;
comment	@## @;


1.6
date	96.02.12.07.13.35;	author rowlands;	state Exp;
branches;
next	1.5;

1.5
date	96.01.20.17.13.10;	author rowlands;	state Exp;
branches;
next	1.4;

1.4
date	95.06.16.06.29.49;	author rowlands;	state Exp;
branches
	1.4.1.0
	1.4.2.0
	1.4.3.0;
next	1.3;

1.3
date	95.04.06.05.48.03;	author rowlands;	state Exp;
branches
	1.3.1.0
	1.3.2.0;
next	1.2;

1.2
date	95.04.06.05.42.26;	author rowlands;	state Exp;
branches;
next	1.1;

1.1
date	95.04.06.02.06.11;	author rowlands;	state Exp;
branches;
next	;

1.3.1.0
date	95.06.12.00.02.16;	author rowlands;	state Exp;
branches;
next	1.3.1.1;

1.3.1.1
date	95.06.14.03.05.09;	author rowlands;	state Exp;
branches;
next	1.3.1.2;

1.3.1.2
date	95.06.15.18.18.49;	author rowlands;	state Exp;
branches;
next	1.3.1.3;

1.3.1.3
date	95.06.16.02.04.49;	author rowlands;	state Exp;
branches;
next	1.3.1.4;

1.3.1.4
date	95.06.16.03.08.10;	author rowlands;	state Exp;
branches;
next	;

1.3.2.0
date	95.06.16.04.50.21;	author rowlands;	state Exp;
branches;
next	1.3.2.1;

1.3.2.1
date	95.06.16.06.27.03;	author rowlands;	state Exp;
branches;
next	;

1.4.1.0
date	95.11.06.04.11.25;	author rowlands;	state Exp;
branches;
next	1.4.1.1;

1.4.1.1
date	95.11.06.04.12.25;	author rowlands;	state Exp;
branches;
next	;

1.4.2.0
date	95.11.06.04.16.47;	author rowlands;	state Exp;
branches;
next	1.4.2.1;

1.4.2.1
date	95.11.06.04.19.12;	author rowlands;	state Exp;
branches;
next	;

1.4.3.0
date	95.11.06.04.22.39;	author rowlands;	state Exp;
branches;
next	1.4.3.1;

1.4.3.1
date	96.01.19.04.40.26;	author rowlands;	state Exp;
branches;
next	1.4.3.2;

1.4.3.2
date	96.01.20.17.10.43;	author rowlands;	state Exp;
branches;
next	;


desc
@MPEG-2 public C encoder
@


1.6
log
@Release following Munich meeting
@
text
@###############################################################################
## Copyright (c) 1995 MPEG/audio software simulation group
## All Rights Reserved
## $Id: makefile 1.5 1996/01/20 17:13:10 rowlands Exp rowlands $
##
## MPEG/audio coding/decoding software, work in progress
##   NOT for public distribution until verified and approved by the
##   MPEG/audio committee.
##
## $Log: makefile $
## Revision 1.5  1996/01/20 17:13:10  rowlands
## Moved Merged into main trunk
##
## Revision 1.4.3.2  1996/01/20  17:10:43  rowlands
## Added make "test" to encode decoded compliance bitstreams in
## test directory. Also added make "veryclean" to remove all but source.
##
## Revision 1.4.3.1  1996/01/19  04:40:26  rowlands
## Merged
##
## Revision 1.4  1995/06/16  06:29:49  rowlands
## Moved merged IRT/TI into main revision control trunk.
##
## Revision 1.3.2.1  1995/06/16  06:27:03  rowlands
## Added file dyncross.c
##
## Revision 1.3.2.0  1995/06/16  04:50:21  rowlands
## Created branch for IRT
##
## Revision 1.3.1.4  1995/06/16  03:08:10  rowlands
## Added make clean
##
## Revision 1.3.1.0  1995/06/12  00:02:16  rowlands
## Created branch for TI
##
## Revision 1.3  1995/04/06  05:48:03  rowlands
## Added file lingual.c
##
## Revision 1.2  1995/04/06  05:42:26  rowlands
## Added RCS header and multi-machine support
##
###############################################################################

###############################
# Compiler flags for UNIX
CC		= gcc
CFLAGS		= -DUNIX -g2 -O
LFLAGS		= -lm
EXE_SUFFIX	=
OBJ_SUFFIX	= .o

###############################
# Compiler flags for DOS MSC6.0
#CC		= cl
#CFLAGS		= -Zi -Gt -AH -DMSDOS -DMS_DOS
#LFLAGS		= -link /stack:0x8000
#EXE_SUFFIX	= .exe
#OBJ_SUFFIX	= .obj

.c$(OBJ_SUFFIX):
	$(CC) -c $(CFLAGS) $<

###############################
# Compiler flags for Indigo R4000
# CC=gcc
# ANSI-C (default), include debug info, allow profiling, full warnings
# CFLAGS =  -g2 -p -fullwarn
# CFLAGS =  -g2 -p
# CFLAGS = -ansi -g2 -w2 -O0 
# CFLAGS = -ansi -g2 -O0 
# CFLAGS = -g2 -w2 -O0 -G 0 -v
# CFLAGS = -Aa -g fur hp850a

.c$(OBJ_SUFFIX):
	$(CC) -c $(CFLAGS) $<

ENCOBJS = encode$(OBJ_SUFFIX) common$(OBJ_SUFFIX) musicin$(OBJ_SUFFIX) \
	subs$(OBJ_SUFFIX) psy$(OBJ_SUFFIX) tonal$(OBJ_SUFFIX) \
	predisto$(OBJ_SUFFIX) lingual$(OBJ_SUFFIX) dyn_cross$(OBJ_SUFFIX) \
	lfe$(OBJ_SUFFIX)

musicin$(EXE_SUFFIX) : $(ENCOBJS)
	$(CC) $(CFLAGS) -o $@@ $(ENCOBJS) $(LFLAGS)

clean:
	rm -f $(ENCOBJS)

veryclean:
	rm -f $(ENCOBJS) musicin$(EXE_SUFFIX) test/*.mpg test/*.ext

test: musicin$(EXE_SUFFIX)
	-for f in test/test*.aiff ; do musicin$(EXE_SUFFIX) $$f ; done

test01: musicin$(EXE_SUFFIX)
	-musicin$(EXE_SUFFIX) test/test01.aiff
@


1.5
log
@Moved Merged into main trunk
@
text
@d4 1
a4 1
## $Id: makefile 1.4.3.2 1996/01/20 17:10:43 rowlands Exp $
d11 3
d47 1
a47 1
CFLAGS		= -DUNIX -g2
d92 4
a95 1
	-for f in test/test*.dec ; do musicin$(EXE_SUFFIX) $$f ; done
@


1.4
log
@Moved merged IRT/TI into main revision control trunk.
@
text
@d4 1
a4 1
## $Id: makefile 1.3.2.1 1995/06/16 06:27:03 rowlands Exp $
d11 10
d60 14
d76 2
a77 1
	predisto$(OBJ_SUFFIX) lingual$(OBJ_SUFFIX) dyn_cross$(OBJ_SUFFIX)
d82 2
a83 1
$(ENCOBJS): common.h encoder.h
d85 5
a89 2
clean:
	rm -f $(ENCOBJS) musicin$(EXE_SUFFIX)
@


1.4.3.0
log
@Branch for merging IRT_02 and Philips_01
@
text
@d4 1
a4 1
## $Id: makefile 1.4 1995/06/16 06:29:49 rowlands Exp $
a10 3
## Revision 1.4  1995/06/16  06:29:49  rowlands
## Moved merged IRT/TI into main revision control trunk.
##
@


1.4.3.1
log
@Merged
@
text
@a52 14
###############################
# Compiler flags for Indigo R4000
# CC=gcc
# ANSI-C (default), include debug info, allow profiling, full warnings
# CFLAGS =  -g2 -p -fullwarn
# CFLAGS =  -g2 -p
# CFLAGS = -ansi -g2 -w2 -O0 
# CFLAGS = -ansi -g2 -O0 
# CFLAGS = -g2 -w2 -O0 -G 0 -v
# CFLAGS = -Aa -g fur hp850a

.c$(OBJ_SUFFIX):
	$(CC) -c $(CFLAGS) $<

d55 1
a55 2
	predisto$(OBJ_SUFFIX) lingual$(OBJ_SUFFIX) dyn_cross$(OBJ_SUFFIX) \
	lfe$(OBJ_SUFFIX)
d59 2
@


1.4.3.2
log
@Added make "test" to encode decoded compliance bitstreams in
test directory. Also added make "veryclean" to remove all but source.
@
text
@d4 1
a4 1
## $Id: makefile 1.4.3.1 1996/01/19 04:40:26 rowlands Exp rowlands $
a10 3
## Revision 1.4.3.1  1996/01/19  04:40:26  rowlands
## Merged
##
d76 1
a76 7
	rm -f $(ENCOBJS)

veryclean:
	rm -f $(ENCOBJS) musicin$(EXE_SUFFIX) test/*.mpg test/*.ext

test: musicin$(EXE_SUFFIX)
	-for f in test/test*.dec ; do musicin$(EXE_SUFFIX) $$f ; done
@


1.4.2.0
log
@Branch for Felderhoff
@
text
@d4 1
a4 1
## $Id: makefile 1.4 1995/06/16 06:29:49 rowlands Exp $
a10 3
## Revision 1.4  1995/06/16  06:29:49  rowlands
## Moved merged IRT/TI into main revision control trunk.
##
@


1.4.2.1
log
@Received from Uwe Felderhoff
@
text
@d1 32
a32 3
# Makefile for Indigo R4000, debugging info present in file. 
# Latest change 1993-04-06 Susanne Ritscher
# only for encoding
d34 7
a40 8
CC=gcc
# ANSI-C (default), include debug info, allow profiling, full warnings
# CFLAGS =  -g2 -p -fullwarn
# CFLAGS =  -g2 -p
# CFLAGS = -ansi -g2 -w2 -O0 
CFLAGS = -ansi -g2 -O0 
# CFLAGS = -g2 -w2 -O0 -G 0 -v
# CFLAGS = -Aa -g fur hp850a
d42 7
d50 10
a59 5
ENCOBJS = encode.o common.o musicin.o subs.o psy.o tonal.o predisto.o dyn_cross.o lfe.o lingual.o
musicin: $(ENCOBJS)
# output, math lib.
#	gcc -o musicin $(ENCOBJS) -lm -lmalloc_cv
	gcc -o musicin $(ENCOBJS) -lm 
d62 2
a63 6
#DECOBJS = decode.o common.o musicout.o
#l12dec: $(DECOBJS)
# output, math lib.
#	gcc -o l12dec $(DECOBJS) -lm
#$(DECOBJS): common.h decoder.h

@


1.4.1.0
log
@Branch for ten Kate
@
text
@d4 1
a4 1
## $Id: makefile 1.4 1995/06/16 06:29:49 rowlands Exp $
a10 3
## Revision 1.4  1995/06/16  06:29:49  rowlands
## Moved merged IRT/TI into main revision control trunk.
##
@


1.4.1.1
log
@Received from Warner ten Kate
@
text
@@


1.3
log
@Added file lingual.c
@
text
@d4 1
a4 1
## $Id: makefile,v 1.2 1995/04/06 05:42:26 rowlands Exp rowlands $
d10 16
a25 1
## $Log: makefile,v $
d52 1
a52 1
	predisto$(OBJ_SUFFIX) lingual$(OBJ_SUFFIX)
d58 3
@


1.3.2.0
log
@Created branch for IRT
@
text
@d4 1
a4 1
## $Id: makefile 1.3 1995/04/06 05:48:03 rowlands Exp $
d10 1
a10 4
## $Log: makefile $
## Revision 1.3  1995/04/06  05:48:03  rowlands
## Added file lingual.c
##
@


1.3.2.1
log
@Added file dyncross.c
@
text
@d4 1
a4 1
## $Id: makefile 1.3.1.4 1995/06/16 03:08:10 rowlands Exp $
a10 9
## Revision 1.3.2.0  1995/06/16  04:50:21  rowlands
## Created branch for IRT
##
## Revision 1.3.1.4  1995/06/16  03:08:10  rowlands
## Added make clean
##
## Revision 1.3.1.0  1995/06/12  00:02:16  rowlands
## Created branch for TI
##
d40 1
a40 1
	predisto$(OBJ_SUFFIX) lingual$(OBJ_SUFFIX) dyn_cross$(OBJ_SUFFIX)
a45 3

clean:
	rm -f $(ENCOBJS) musicin$(EXE_SUFFIX)
@


1.3.1.0
log
@Created branch for TI
@
text
@d4 1
a4 1
## $Id: makefile 1.3 1995/04/06 05:48:03 rowlands Exp $
d10 1
a10 4
## $Log: makefile $
## Revision 1.3  1995/04/06  05:48:03  rowlands
## Added file lingual.c
##
@


1.3.1.1
log
@Compiler flags to enable/disable changes
@
text
@d4 1
a4 1
## $Id: makefile 1.3.1.0 1995/06/12 00:02:16 rowlands Exp rowlands $
a10 3
## Revision 1.3.1.0  1995/06/12  00:02:16  rowlands
## Created branch for TI
##
d22 1
a22 2
CFLAGS		= -O -DUNIX -UBROKEN_MATRIX_FFT -UBROKEN_MATRIX_SBB -UNEW_MATRIX_SBB -UNEW_MATRIX_MUSICIN -DNEW_FILTER_MUSICIN
#CFLAGS		= -DUNIX -UBROKEN
@


1.3.1.2
log
@Compiler switches for working debug system
@
text
@d4 1
a4 1
## $Id: makefile 1.3.1.1 1995/06/14 03:05:09 rowlands Exp rowlands $
a10 3
## Revision 1.3.1.1  1995/06/14  03:05:09  rowlands
## Compiler flags to enable/disable changes
##
d25 1
a25 1
CFLAGS		= -O -DUNIX -DBROKEN_MATRIX_FFT -UBROKEN_MATRIX_SBB -DNEW_MATRIX_SBB -DNEW_MATRIX_MUSICIN -DNEW_FILTER_MUSICIN -UDO_WEIGHT_ML_CHANNELS
a49 3

clean:
	rm -f $(ENCOBJS) musicin$(EXE_SUFFIX)
@


1.3.1.3
log
@Added compiler flag for dematrix 2 filter debug
@
text
@d4 1
a4 1
## $Id: makefile 1.3.1.2 1995/06/15 18:18:49 rowlands Exp rowlands $
a10 3
## Revision 1.3.1.2  1995/06/15  18:18:49  rowlands
## Compiler switches for working debug system
##
d28 1
a28 1
CFLAGS		= -O -DUNIX -DBROKEN_MATRIX_FFT -UBROKEN_MATRIX_SBB -DNEW_MATRIX_SBB -DNEW_MATRIX_MUSICIN -DNEW_FILTER_MUSICIN -UDO_WEIGHT_ML_CHANNELS -UDISABLE_DEMATRIX2_FILTER
@


1.3.1.4
log
@Added make clean
@
text
@d4 1
a4 1
## $Id: makefile 1.3.1.3 1995/06/16 02:04:49 rowlands Exp rowlands $
d11 6
d31 2
a32 1
CFLAGS		= -DUNIX -g2
@


1.2
log
@Added RCS header and multi-machine support
@
text
@d4 1
a4 1
## $Id$
d10 4
a13 1
## $Log$
d37 1
a37 1
	predisto$(OBJ_SUFFIX)
@


1.1
log
@Initial revision
@
text
@d1 11
a11 4
# Makefile for Indigo R4000, debugging info present in file. 
# Latest change 1993-04-06 Susanne Ritscher
# only for encoding
## Modiffications faites par JMZ 03/03/1995
d13 7
a19 2
# ANSI-C (default), include debug info, allow profiling, full warnings
CFLAGS = -g2 
d21 7
d29 2
a30 5
ENCOBJS = encode.o common.o musicin.o subs.o psy.o tonal.o predistortion.o lingual.o
musicin: $(ENCOBJS)
# output, math lib.
	gcc -o musicin $(ENCOBJS) -lm 
$(ENCOBJS): common.h encoder.h
d32 3
d36 4
@
