Adding extract-all and extract-all-inv bash scripts that create latex tabular data...

[loba.git] / Makefile

diff --git a/Makefile b/Makefile
index f142b37f9a5cb264d081d135237dc2510802ce14..751418c49ef18bfe4bba1765e539b292022af971 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-SIMGRID_INSTALL_DIR ?= ./simgrid-stable
-#SIMGRID_INSTALL_DIR ?= ./simgrid-dev
+#SIMGRID_INSTALL_DIR ?= $(PWD)/simgrid-stable
+SIMGRID_INSTALL_DIR ?= $(PWD)/simgrid-dev

 
 OPTIM_FLAGS += -O3
 DEBUG_FLAGS += -g
 
 OPTIM_FLAGS += -O3
 DEBUG_FLAGS += -g


@@ -10,7 +10,6 @@ CC := gcc
 CXX := g++
 
 CPPFLAGS += -I $(SIMGRID_INSTALL_DIR)/include
 CXX := g++
 
 CPPFLAGS += -I $(SIMGRID_INSTALL_DIR)/include

-CPPFLAGS += -D XBT_LOG_OLD_STYLE

 CPPFLAGS += $(CHECK_FLAGS)
 
 #CFLAGS += -std=c99
 CPPFLAGS += $(CHECK_FLAGS)
 
 #CFLAGS += -std=c99


@@ -35,31 +34,23 @@ SRC.loba := main.cpp                \
        deployment.cpp          \
        hostdata.cpp            \
        $(wildcard loba_*.cpp)  \
        deployment.cpp          \
        hostdata.cpp            \
        $(wildcard loba_*.cpp)  \

+       messages.cpp            \

        misc.cpp                \
        misc.cpp                \

+       msg_thread.cpp          \

        neighbor.cpp            \
        options.cpp             \
        process.cpp             \
        version.cpp
 
        neighbor.cpp            \
        options.cpp             \
        process.cpp             \
        version.cpp
 

-SRC.simple_async := simple_async.cpp
-
-SRC := $(SRC.loba) $(SRC.simple_async)
+SRC := $(SRC.loba)

 OBJ := $(SRC:%.cpp=%.o)
 OBJ := $(SRC:%.cpp=%.o)

-DEP := $(SRC:%.cpp=%.d)
+DEP := $(SRC:%.cpp=.%.d)

 
 DEFAULT_TARGETS := loba
 FLAVOURED_LOBA := loba-dev loba-stable
 
 DEFAULT_TARGETS := loba
 FLAVOURED_LOBA := loba-dev loba-stable

-TARGETS := $(DEFAULT_TARGETS)  \
-          simple_async
-
-XML_FILES =                                            \
-       Dep.xml  Plat.xml                               \
-       platform.xml deployment.xml simple_async.xml    \
-       cluster1000.xml
-
-XML_DEV_FILES = $(XML_FILES:%.xml=%_dev.xml)
+TARGETS := $(DEFAULT_TARGETS)

 
 

-.PHONY: all full xml clean realclean $(FLAVOURED_LOBA)
+.PHONY: all full clean realclean $(FLAVOURED_LOBA)

 
 all: $(DEFAULT_TARGETS)
 
 
 all: $(DEFAULT_TARGETS)
 


@@ -70,8 +61,6 @@ full:
        done
        $(MAKE) xml $(DEFAULT_TARGETS)
 
        done
        $(MAKE) xml $(DEFAULT_TARGETS)
 

-xml: $(XML_DEV_FILES)
-

 clean:
        $(RM) core core.[0-9]* vgcore.[0-9]*
        $(RM) localversion
 clean:
        $(RM) core core.[0-9]* vgcore.[0-9]*
        $(RM) localversion


@@ -84,14 +73,11 @@ realclean: clean
        $(RM) $(XML_DEV_FILES)
        $(RM) *~
 
        $(RM) $(XML_DEV_FILES)
        $(RM) *~
 

-%.d: %.cpp ; $(MAKEDEPEND.CXX)
-
-%_dev.xml: %.xml
-       sed '/DOCTYPE/s,simgrid.dtd,http://simgrid.gforge.inria.fr/&,' $< > $@
+.%.d: %.cpp ; $(MAKEDEPEND.CXX)

 
 $(FLAVOURED_LOBA):
        $(MAKE) clean
 
 $(FLAVOURED_LOBA):
        $(MAKE) clean

-       $(MAKE) SIMGRID_INSTALL_DIR=./simgrid-$(patsubst loba-%,%,$@) loba
+       $(MAKE) SIMGRID_INSTALL_DIR=$(PWD)/simgrid-$(patsubst loba-%,%,$@) loba

        mv -f -- loba $@
        $(MAKE) clean
 
        mv -f -- loba $@
        $(MAKE) clean