Update .gitignore.

[loba.git] / Makefile

diff --git a/Makefile b/Makefile
index 8a6bff430f18e8d85ecdee2bd9ad1e7787ae5961..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


@@ -34,22 +34,21 @@ 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
+TARGETS := $(DEFAULT_TARGETS)

 
 .PHONY: all full clean realclean $(FLAVOURED_LOBA)
 
 
 .PHONY: all full clean realclean $(FLAVOURED_LOBA)
 


@@ -60,11 +59,10 @@ full:
                echo $(MAKE) "$$target";        \
                $(MAKE) "$$target";             \
        done
                echo $(MAKE) "$$target";        \
                $(MAKE) "$$target";             \
        done

-       $(MAKE) $(DEFAULT_TARGETS)
+       $(MAKE) xml $(DEFAULT_TARGETS)

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

-       $(RM) misc_autogen.h

        $(RM) localversion
        $(RM) $(OBJ)
        $(RM) $(DEP)
        $(RM) localversion
        $(RM) $(OBJ)
        $(RM) $(DEP)


@@ -72,20 +70,17 @@ clean:
 
 realclean: clean
        $(RM) $(FLAVOURED_LOBA)
 
 realclean: clean
        $(RM) $(FLAVOURED_LOBA)

+       $(RM) $(XML_DEV_FILES)

        $(RM) *~
 
        $(RM) *~
 

-%.d: %.cpp ; $(MAKEDEPEND.CXX)
+.%.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
 

-misc_autogen.h: $(SIMGRID_INSTALL_DIR)/include/xbt/log.h
-       grep -C1 '# *define *CLOG' $< \
-       | sed 's/CLOG/XCLOG/;s/_XBT_LOGV\(([^)]*)\)/(*\1)/' > $@
-

 version.o: $(patsubst %.cpp,%.o,$(filter-out version.cpp, $(SRC.loba)))
 
 ifeq ($(filter $(MAKECMDGOALS),full clean realclean $(FLAVOURED_LOBA)),)
 version.o: $(patsubst %.cpp,%.o,$(filter-out version.cpp, $(SRC.loba)))
 
 ifeq ($(filter $(MAKECMDGOALS),full clean realclean $(FLAVOURED_LOBA)),)