diff options
author | Calvin <calvin@EESI> | 2013-04-02 16:44:58 -0400 |
---|---|---|
committer | Calvin <calvin@EESI> | 2013-04-02 16:44:58 -0400 |
commit | 5cd00e104c8ea402cb744d70bd2ba490be9bc0d1 (patch) | |
tree | e4657fcc2fbf8e393a557b94dc33aa8b6fcbbdb4 | |
parent | 77593c6295da4159911c9f706149f21e43da5ec8 (diff) |
use ld so that the linking works properly on all systems (gcc you drive me crazy), and update the readme to tell users to use ldconfig
-rw-r--r-- | FEAST/FSToolbox/Makefile | 3 | ||||
-rw-r--r-- | README.markdown | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/FEAST/FSToolbox/Makefile b/FEAST/FSToolbox/Makefile index 2ce5ec3..b8baade 100644 --- a/FEAST/FSToolbox/Makefile +++ b/FEAST/FSToolbox/Makefile @@ -39,11 +39,12 @@ PREFIX = /usr CXXFLAGS = -O3 -fPIC COMPILER = gcc +LINKER = ld MITOOLBOXPATH = ../MIToolbox/ objects = mRMR_D.o CMIM.o JMI.o DISR.o CondMI.o ICAP.o BetaGamma.o libFSToolbox.so : $(objects) - $(COMPILER) $(CXXFLAGS) -lMIToolbox -L$(MITOOLBOXPATH) -shared -o libFSToolbox.so $(objects) + $(LINKER) -lMIToolbox -lm -shared -o libFSToolbox.so $(objects) mRMR_D.o: mRMR_D.c $(COMPILER) $(CXXFLAGS) -DCOMPILE_C -c mRMR_D.c -I$(MITOOLBOXPATH) diff --git a/README.markdown b/README.markdown index 416e4b2..c980bda 100644 --- a/README.markdown +++ b/README.markdown @@ -38,12 +38,15 @@ Make FSToolbox and install it: make sudo make install +Run ldconfig to update your library cache + + sudo ldconfig + Install our PyFeast module python ./setup.py build sudo python ./setup.py install - ## Demonstration See test/test.py for an example with uniform data and an image data set. The image data set was collected from the digits example in |