Fixed Container loading, informative display.

[architektonas] / Makefile

diff --git a/Makefile b/Makefile
index 60003dba35079b6ea508cdbcea1bab8e83eff6d2..cee9a70af8f086d1af7d3a1916756057d6212a45 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # Makefile for Architektonas
 #
 # by James Hammons
-# (C) 2010 Underground Software
+# (C) 2011 Underground Software
 
 # users home dir:
 #INSTALLDIR = $(HOME)/local
@@ -22,26 +22,22 @@ makefile-qt: architektonas.pro
        @echo -e "\033[01;33m***\033[00;32m Creating Qt makefile...\033[00m"
        qmake architektonas.pro -o makefile-qt
 
-libs: dxflib/lib/libdxf.a fparser/lib/libfparser.a
-#      @echo -e "\033[01;33m***\033[00;32m Making dxflib & fparser...\033[00m"
-#      $(MAKE) -C dxflib
-#      $(MAKE) -C fparser
-
-dxflib/lib/libdxf.a:
-       @echo -e "\033[01;33m***\033[00;32m Making dxflib...\033[00m"
-       $(MAKE) -C dxflib
+libs:
+       @echo -e "\033[01;33m***\033[00;32m Make libs here (if any)...\033[00m"
+#libs: dxflib/lib/libdxf.a
 
-fparser/lib/libfparser.a:
-       @echo -e "\033[01;33m***\033[00;32m Making fparser...\033[00m"
-       $(MAKE) -C fparser
+#dxflib/lib/libdxf.a:
+#      @echo -e "\033[01;33m***\033[00;32m Making dxflib...\033[00m"
+#      $(MAKE) -C dxflib
 
-sources: src/mainapp/*.h src/actions/*.h src/base/*.h src/widgets/*.h src/forms/*.h src/mainapp/*.cpp src/actions/*.cpp src/base/*.cpp src/widgets/*.cpp src/forms/*.cpp
+sources: src/*.h src/*.cpp
 
 clean:
        @echo -ne "\033[01;33m***\033[00;32m Cleaning out the garbage...\033[00m"
-       $(MAKE) -C dxflib clean
-       $(MAKE) -C fparser clean
-       $(MAKE) -f makefile-qt clean
+#      $(MAKE) -C dxflib clean
+       -$(MAKE) -f makefile-qt clean
+       -rm -rf ./obj
+       -rm makefile-qt
        -rm architektonas
        -$(FIND) . -name "*~" -exec rm -f {} \;
        @echo "done!"
@@ -49,10 +45,13 @@ clean:
 #docu:
 #      -(doxygen ./doxygen.cfg)
 
+# ANSI colors:
+# (00) 31 = dark red, 32 = dark green, 33 = brown, 34 = dark blue, 35 = dark purple, 36 = dark cyan, 37 = grey
+# (01) 31 = red, 32 = green, 33 = yellow, 34 = blue, 35 = purple, 36 = cyan, 37 = white
 statistics:
-       @echo -n "Lines in source files: "
-       @-$(FIND) -name *.cpp | xargs cat | wc -l
-       @echo -n "Lines in header files: "
-       @-$(FIND) -name *.h | xargs cat | wc -l
+       @echo -ne "\033[01;35mLines in source files:\033[00m "
+       @-$(FIND) ./src -name "*.cpp" | xargs cat | wc -l
+       @echo -ne "\033[01;35mLines in header files:\033[00m "
+       @-$(FIND) ./src -name "*.h" | xargs cat | wc -l
 
 dist:  clean