From e42756200418833715c0cedd1791025f27673987 Mon Sep 17 00:00:00 2001 From: nemu Date: Mon, 16 Jun 2008 10:44:13 +0000 Subject: [PATCH] fixed faulty dependency to MuSR_td_PSI_bin (PSI BIN) --- src/ToDo.txt | 4 ++-- src/classes/Makefile.PMusr | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ToDo.txt b/src/ToDo.txt index ac6f1e4c..90a8dc90 100644 --- a/src/ToDo.txt +++ b/src/ToDo.txt @@ -61,10 +61,10 @@ short term: to look for them and use them. **UNDER WAY, NOT TESTED YET** 08-06-05 * tshift implementation under way. Wrong and needs to be fixed: - MakeCleanAndTidyTheoryBlock should only handle the currently parsed line!! + **FIXED** 08-06-16 * faulty dependency check in the Makefile when handling the PSI-Bin-Class stuff. - Needs to be fixed! + Needs to be fixed! **FIXED** 08-06-16 --------------------- intermediate term: diff --git a/src/classes/Makefile.PMusr b/src/classes/Makefile.PMusr index bd393c29..85367e73 100644 --- a/src/classes/Makefile.PMusr +++ b/src/classes/Makefile.PMusr @@ -110,7 +110,7 @@ SHLIB = libPMusr.so # all: $(SHLIB) -$(SHLIB): $(OBJS) +$(SHLIB): $(OBJS) $(EXTOBJS) @echo "---> Building shared library $(SHLIB) ..." /bin/rm -f $(SHLIB) $(LD) $(OBJS) $(EXTOBJS) $(SOFLAGS) -o $(SHLIB) $(FFTW3LIB) $(GLIBS) $(PSILIBS) $(MNLIB) $(GSLLIB) @@ -127,7 +127,7 @@ clean:; @rm -f $(OBJS) *Dict* core* $(OBJS): %.o: %.cpp $(CXX) $(INCLUDES) $(CXXFLAGS) -c $< -MuSR_td_PSI_bin.o: ../external/MuSR_software/Class_MuSR_PSI/MuSR_td_PSI_bin.cpp +$(EXTOBJS): ../external/MuSR_software/Class_MuSR_PSI/MuSR_td_PSI_bin.cpp $(CXX) $(INCLUDES) $(CXXFLAGS) -c ../external/MuSR_software/Class_MuSR_PSI/MuSR_td_PSI_bin.cpp PStartupHandlerDict.cpp: ../include/PStartupHandler.h ../include/PStartupHandlerLinkDef.h