diff --git a/utils/Makefile b/utils/Makefile index 7b056b16b5e646d7af1ae0f0101b8f2c1ead0027..1eb7b80f47f9622dca28aba432da738da126e5d7 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -6,7 +6,7 @@ include ../Make_include #OPTC += -openmp #OPTC += -g -O0 -ALL: makemod makewave extendModel fconv correigen green green3D basop syn2d mat2su ftr1d +ALL: makemod makewave extendModel fconv correigen green green3D basop syn2d mat2su ftr1d ampdet SRCM = \ makemod.c \ @@ -133,6 +133,15 @@ SRCT = ftr1d.c \ docpkge.c \ getpars.c +SRCAD = ampdet.c \ + getFileInfo.c \ + readData.c \ + writeData.c \ + verbosepkg.c \ + atopkge.c \ + docpkge.c \ + getpars.c + OBJM = $(SRCM:%.c=%.o) makemod: $(OBJM) @@ -188,7 +197,12 @@ OBJT = $(SRCT:%.c=%.o) ftr1d: $(OBJT) $(CC) $(LDFLAGS) $(OPTC) $(CFLAGS) -o ftr1d $(OBJT) $(LIBS) -install: makemod makewave extendModel fconv correigen green green3D basop syn2d mat2su ftr1d +OBJAD = $(SRCAD:%.c=%.o) + +ampdet: $(OBJAD) + $(CC) $(LDFLAGS) $(OPTC) $(CFLAGS) -o ampdet $(OBJAD) $(LIBS) + +install: makemod makewave extendModel fconv correigen green green3D basop syn2d mat2su ftr1d cp makemod $B cp makewave $B cp extendModel $B @@ -202,7 +216,7 @@ install: makemod makewave extendModel fconv correigen green green3D basop syn2d cp ftr1d $B clean: - rm -f core $(OBJM) makemod $(OBJW) makewave $(OBJE) extendModel $(OBJF) fconv $(OBJG) $(OBJC) correigen green $(OBJG3) green3D $(OBJB) basop $(OBJJ) syn2d $(OBJS) mat2su $(OBJA) ftr1d $(OBJT) + rm -f core $(OBJM) makemod $(OBJW) makewave $(OBJE) extendModel $(OBJF) fconv $(OBJG) $(OBJC) correigen green $(OBJG3) green3D $(OBJB) basop $(OBJJ) syn2d $(OBJS) mat2su $(OBJA) ftr1d $(OBJT) ampdet $(OBJAD) realclean: clean rm -f $B/makemod $B/makewave $B/extendModel $B/fconv $B/correigen $B/green $B/green3D $B/basop $B/syn2d $B/mat2su $B/ftr1d diff --git a/utils/green3D b/utils/green3D index c2f71642dbc9a737f12146aaac155419fe32ad9c..6a6efca3d459ed96820d7190fd85ffe637948bf2 100755 Binary files a/utils/green3D and b/utils/green3D differ