merge

Merge branch 'develop'

arithmetic.cpp

@@ -0,0 +1,7 @@
+#include "arithmetic.h"
+
+int add(int a, int b)
+{
+	int c = a+b;
+	return c;
+}

arithmetic.h

@@ -0,0 +1,2 @@
+int add(int,int);
+

main.cpp

@@ -0,0 +1,10 @@
+#include <iostream>
+#include "arithmetic.h"
+int main()
+{
+
+	std::cout<<"Hello world!"<<std::endl;
+	std::cout<<"c="<<add(1,2)<<std::endl;
+	
+	return 0;
+}

makefile.txt

@@ -0,0 +1,12 @@
+all: main arithmetic
+	g++ main.o arithmetic.o
+	
+main: main.cpp
+	g++ -c main.cpp
+
+arithmetic: arithmetic.cpp arithmetic.h
+	g++ -c arithmetic.cpp
+
+clean:
+	rm*.o
+	rm a.out