From: mquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Tue, 23 Mar 2010 14:44:01 +0000 (+0000)
Subject: make git happy with cmake
X-Git-Tag: SVN~413
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/1fcefdf51c34cc1bee8cfbd6199a47e6e09f1edb

make git happy with cmake

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7326 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/.gitignore b/.gitignore
index 8c173a1fa5..f911df5e58 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,9 @@ src/supernovae_*.c
 src/simgrid_units_main.c
 src/gras_config.h.in
 
+cmake_install.cmake
+CMakeFiles
+
 tools/graspe_master
 examples/java/*/classnoinst.stamp
 ###
diff --git a/examples/msg/properties/Makefile b/examples/msg/properties/Makefile
deleted file mode 100644
index 1d4b6a1058..0000000000
--- a/examples/msg/properties/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-all: msg_prop 
-masterslave: msg_prop.o
-
-INSTALL_PATH = $$HOME
-CC = gcc
-PEDANTIC_PARANOID_FREAK =       -O0 -Wshadow -Wcast-align \
-				-Waggregate-return -Wmissing-prototypes -Wmissing-declarations \
-				-Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations \
-				-Wmissing-noreturn -Wredundant-decls -Wnested-externs \
-				-Wpointer-arith -Wwrite-strings -finline-functions
-REASONABLY_CAREFUL_DUDE =	-Wall
-NO_PRAYER_FOR_THE_WICKED =	-w -O2 
-WARNINGS = 			$(REASONABLY_CAREFUL_DUDE)
-CFLAGS = -g $(WARNINGS)
-
-INCLUDES = -I$(INSTALL_PATH)/include
-DEFS = -L$(INSTALL_PATH)/lib/
-LDADD = -lm -lsimgrid 
-LIBS = 
-
-%: %.o
-	$(CC) $(INCLUDES) $(DEFS) $(CFLAGS) $^ $(LIBS) $(LDADD) -o $@ 
-
-%.o: %.c
-	$(CC) $(INCLUDES) $(DEFS) $(CFLAGS) -c -o $@ $<
-
-clean:
-	rm -f $(BIN_FILES) *.o *~
-.SUFFIXES:
-.PHONY : clean