r177: *** empty log message ***

diff --git a/include/filter.h b/include/filter.h
index a0c4b4b15c57a7e627a51f4b15aec63026c06bb1..ad2fc260b77f8dbdb46ff910f46a9d7be29492d1 100644 (file)
--- a/include/filter.h
+++ b/include/filter.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: filter.h,v 1.18 2000/08/03 09:57:33 kevin Exp $
+**  $Id: filter.h,v 1.19 2000/08/09 22:52:52 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -148,6 +148,10 @@ class SignalFilter {
   static int convertDomainNameToID (const char* const domainName);
   static const char* convertDomainIDToName (const int idDomain);
   static const char* convertDomainIDToTitle (const int idDomain);
+
+  static const int getFrequencyFilterCount() {return s_iFrequencyFilterCount;}
+  static const char** getFrequencyFilterNameArray() {return s_aszFrequencyFilterName;}
+  static const char** getFrequencyFilterTitleArray() {return s_aszFrequencyFilterTitle;}
   static int convertFrequencyFilterNameToID (const char* const ffName);
   static const char* convertFrequencyFilterIDToName (const int idFF);
   static const char* convertFrequencyFilterIDToTitle (const int idFF);

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 02edc5901a91466ad64c40f58a3bd8a6319d3d58..24c8c691fa3f1f95db83c79c9df07b32d2a2bb61 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -50,18 +50,15 @@ CC_LAM = $(lamdir)/bin/balky
 LAM_EXTRA_SRC = mpiworld.cpp
 
 pjrec-lam: pjrec.cpp mpiworld.cpp ../include/ct.h  ../libctsim/libctsim.a ../libctsupport/libctsupport.a
-       $(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI pjrec.cpp -o pjrec-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
+       $(CC_LAM) @lamdefs@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI pjrec.cpp -o pjrec-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
 
 phm2pj-lam: phm2pj.cpp mpiworld.cpp ../include/ct.h ../libctsim/libctsim.a ../libctsupport/libctsupport.a
-       $(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI phm2pj.cpp -o phm2pj-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
+       $(CC_LAM) @lamdefs@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI phm2pj.cpp -o phm2pj-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
 
 phm2if-lam: phm2if.cpp mpiworld.cpp ../include/ct.h ../libctsim/libctsim.a ../libctsupport/libctsupport.a
-       $(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI phm2if.cpp -o phm2if-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
+       $(CC_LAM) @lamdefs@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI phm2if.cpp -o phm2if-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
 
 endif
 
-shared: pjrec.cpp phm2pj.cpp 
-       $(CC) @DEFS@ $(CFLAGS) $(INCLUDES) -DNO_MAIN -shared phm2pj.cpp pjrec.cpp @ctlibs@ $(LDFLAGS) -o ir.so
-