Merge pull request #46 from milancurcic/update-manual-makefiles

Update manual makefiles

Author: certik

Makefile.manual

@@ -8,11 +8,11 @@ FCFLAGS=-O0
 all: stdlib tests 
 
 stdlib:
-	$(MAKE) -f Makefile.manual FC=${FC} FCFLAGS=${FCFLAGS} --directory=src/lib
+	$(MAKE) -f Makefile.manual FC=${FC} FCFLAGS=${FCFLAGS} --directory=src
 
 tests: stdlib
 	$(MAKE) -f Makefile.manual FC=${FC} FCFLAGS=${FCFLAGS} --directory=src/tests
 
 clean:
-	$(MAKE) -f Makefile.manual clean --directory=src/lib
+	$(MAKE) -f Makefile.manual clean --directory=src
 	$(MAKE) -f Makefile.manual clean --directory=src/tests

README.md

@@ -2,10 +2,29 @@
 
 ## Getting started
 
+### Get the code
+
 ```
 git clone https://github.com/fortran-lang/stdlib
 cd stdlib
+```
+
+### Build with CMake
+
+```
+mkdir build
+cd build
+cmake ..
 make
+ctest
+```
+
+### Build with make
+
+Alternatively, you can build using provided Makefiles:
+
+```
+make -f Makefile.manual
 ```
 
 ## Contributing

src/Makefile.manual

@@ -0,0 +1,20 @@
+OBJS = stdlib_experimental_ascii.o \
+       stdlib_experimental_error.o \
+       stdlib_experimental_io.o \
+
+.PHONY: all clean
+.SUFFIXES: .f90 .o
+
+all: $(OBJS)
+
+.f90.o:
+	$(FC) $(FCFLAGS) -c $<
+
+%.o: %.mod
+
+stdlib_experimental_ascii.o: stdlib_experimental_ascii.f90
+stdlib_experimental_error.o: stdlib_experimental_error.f90
+stdlib_experimental_io.o: stdlib_experimental_io.f90
+
+clean:
+	$(RM) *.o *.mod

src/lib/Makefile.manual

@@ -1,18 +1,13 @@
-# Fortran stdlib Makefile
-
-CPPFLAGS=-I../lib
-OBJS = ../lib/mod_stdlib.o
-
 .PHONY: all clean
-.SUFFIXES: .f90 .o
 
-all: test_dummy
+all: ascii/test_ascii loadtxt/test_loadtxt
 
-test_dummy: test_dummy.f90 $(OBJS)
-	$(FC) $(FCFLAGS) $(CPPFLAGS) $< -o $@ $(OBJS)
+ascii/test_ascii:
+	$(MAKE) -f Makefile.manual --directory=ascii
 
-%.o: %.mod
+loadtxt/test_loadtxt:
+	$(MAKE) -f Makefile.manual --directory=loadtxt
 
 clean:
-	$(RM) test_dummy
-	$(RM) *.o *.mod
+	$(MAKE) -f Makefile.manual --directory=ascii clean
+	$(MAKE) -f Makefile.manual --directory=loadtxt clean

src/lib/mod_stdlib.f90

@@ -0,0 +1,17 @@
+CPPFLAGS = -I../..
+OBJS = ../../stdlib_experimental_ascii.o \
+       ../../stdlib_experimental_error.o
+
+.PHONY: all clean
+.SUFFIXES: .f90 .o
+
+all: test_ascii
+
+test_ascii: test_ascii.f90 $(OBJS)
+	$(FC) $(FCFLAGS) $(CPPFLAGS) $< -o $@ $(OBJS)
+
+%.o: %.mod
+
+clean:
+	$(RM) test_ascii
+	$(RM) *.o *.mod

src/tests/Makefile.manual

@@ -0,0 +1,20 @@
+CPPFLAGS = -I../..
+OBJS = ../../stdlib_experimental_error.o \
+       ../../stdlib_experimental_io.o
+
+.PHONY: all clean
+.SUFFIXES: .f90 .o
+
+all: test_loadtxt test_savetxt
+
+test_loadtxt: test_loadtxt.f90 $(OBJS)
+	$(FC) $(FCFLAGS) $(CPPFLAGS) $< -o $@ $(OBJS)
+
+test_savetxt: test_savetxt.f90 $(OBJS)
+	$(FC) $(FCFLAGS) $(CPPFLAGS) $< -o $@ $(OBJS)
+
+%.o: %.mod
+
+clean:
+	$(RM) test_loadtxt test_savetxt
+	$(RM) *.o *.mod