Changeset 2743 in Sophya for trunk/SophyaExt/MinuitAdapt

Timestamp:

May 20, 2005, 9:57:11 AM (20 years ago)

Author:

cmv

Message:

suite nouvelle structure cmv 20/05/05

Location:

trunk/SophyaExt/MinuitAdapt

Files:

• Makefile (modified) (1 diff)
• minuitadapt.cc (modified) (1 diff)
• objlist.list (added)
• smakefile (added)
• testminuit.cc (modified) (1 diff)

trunk/SophyaExt/MinuitAdapt/Makefile

@@ -1 @@
-MODULECXXREPNAME :=  MinuitAdapt
-MODULEDECCXXFLAGS := -msg_quiet
-include ../Mgr/Makefile.h
+include ../BuildMgr/sophyamake.inc
 
-CFLAGS   := $(CFLAGS) -Df2cFortran
 CPPFLAGS := $(CPPFLAGS) -Df2cFortran
 CXXFLAGS := $(CXXFLAGS) -Df2cFortran
  
-all: $(LIB)libMinuitAdapt.a
+all: $(SOPHYALIBP)libMinuitAdapt.a
 
-clean: cleantest
-        rm -f $(OBJ)minuitadapt.o $(OBJ)minuitadaptF.o
-        rm -f $(LIB)libMinuitAdapt.a
-
-cleantest:
+clean:
+        rm -f $(SOPHYAOBJP)minuitadapt.o $(SOPHYAOBJP)minuitadaptF.o
+        rm -f $(SOPHYALIBP)libMinuitAdapt.a
         rm -f testminuit testminuit.o
-
-# Doit etre fait automatiquement par mkmflien
-install:
-        cp localmnpout.h minuitprot.h minuitadapt.h $(INC)/.
-
-#----------------------------------------------------------------------
-$(LIB)libMinuitAdapt.a : $(OBJ)minuitadapt.o $(OBJ)minuitadaptF.o
-        $(ARCXX) $(ARCXXFLAGS) $@ $($(ARARGS))
-ifeq ($(CXX),cxx)
-        $(CXX) $? $(CPPFLAGS) $(CXXFLAGS) -o $(OBJ)xx.x -Hf
-endif 
- 
-$(OBJ)minuitadaptF.o: minuitadaptF.f
-$(OBJ)minuitadapt.o: minuitadapt.cc minuitadapt.h minuitprot.h
-
-#----------------------------------------------------------------------
-ifdef NOSHLIB
-LIBS = -L$(LIB) -lFitsIOServer -lSamba -lSkyMap -lSkyT -lNTools -lHiStats -lTArray -lSysTools -lm
-ifeq ($(CXX),cxx)
-LIBS := $(LIBS) -lertcxx
-endif
-else
-LIBS = -L$(SLB) -lsophya -lextsophya  -lm
-endif
-LIBMINUIT := -L$(LIB) -lMinuitAdapt -L$(EXTLIBPATH) -lminuit
-LDLIBS := $(LIBS) $(LDLIBS) $(LIBMINUIT) $(LIBFORT)
 
 test: testminuit
 
+
+$(SOPHYALIBP)libMinuitAdapt.a : $(SOPHYAOBJP)minuitadapt.o $(SOPHYAOBJP)minuitadaptF.o
+        $(AR) $(ARFLAGS) $@ $?
+
+$(SOPHYAOBJP)minuitadapt.o: minuitadapt.cc minuitadapt.h minuitprot.h
+        $(CXXCOMPILE) -o $@ $<
+
+$(SOPHYAOBJP)minuitadaptF.o: minuitadaptF.f
+        $(FCCOMPILE) -o $@ $<
+        
 testminuit: testminuit.o
-        $(LINK.cc) $^ -o $@ $(LOADLIBES) $(LDLIBS)
-$(OBJ)testminuit.o: testminuit.cc
+        $(CXXLINK) $^ -o $@ $(SOPHYAEXTSLBLIST)
+testminuit.o: testminuit.cc

trunk/SophyaExt/MinuitAdapt/minuitadapt.cc

@@ -3 +3 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <iostream.h>
+#include <iostream>
 #include <string.h>
 #include <string>

trunk/SophyaExt/MinuitAdapt/testminuit.cc

@@ -5 +5 @@
 #include <stdlib.h>
 #include <stdio.h>
-#include <iostream.h>
+#include <iostream>
 #include <math.h>
 #include <string.h>