Mercurial > hg > aimc

changeset 584:b4650540cb24

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(none)
author Ulf.Hammarqvist@gmail.com
date Wed, 10 Oct 2012 19:30:59 +0000
parents 5c607bcfa89f
children b8a961149499
files branches/carfac_cpp/makefile
diffstat 1 files changed, 11 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/branches/carfac_cpp/makefile	Tue Jul 10 07:44:29 2012 +0000
+++ b/branches/carfac_cpp/makefile	Wed Oct 10 19:30:59 2012 +0000
@@ -19,7 +19,7 @@
 CPPFLAGS += -I$(SRC_HEADERDIR) -I$(GTEST_DIR)/include
 CXXFLAGS += -g -Wall -Wextra -std=gnu++0x #IMPORTANT note gnu++0x
 
-UNITS = AGC CAR CARFAC Ear IHC #Add build units here (without the .cpp)
+UNITS = CARFAC AGC CAR Ear IHC #Add build units here (without the .cpp)
 SRC_OBJ = $(addprefix $(SRC_DIR)/, $(addsuffix .o, $(UNITS)))
 
 GTEST_HEADERS = $(GTEST_DIR)/include/gtest/*.h \
@@ -27,37 +27,38 @@
                 
 GTEST_SRCS_ = $(GTEST_DIR)/src/*.cc $(GTEST_DIR)/src/*.h $(GTEST_HEADERS)
 
-all : CARFAC_unittest AGC_unittest #make some other "main" target
+all : 
+    CARFAC_unittest AGC_unittest #make some other "main" target
 
 clean :
-	rm -f *.o *.a src/*.o unittest/*.o *_unittest.exe
+    rm -f *.o *.a src/*.o unittest/*.o *_unittest.exe
 
 CARFAC_unittest : $(SRC_TESTDIR)/CARFAC_unittest.o $(SRC_OBJ)
 
 # pattern magic
 $(SRC_DIR)/%.o : %.cpp $(SRC_HEADERS) #normal source
-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(.SOURCE)
+    $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(.SOURCE)
 
 $(SRC_TESTDIR)/%.o : %.cpp $(SRC_HEADERS) $(GTEST_HEADERS) # unittest
-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(.SOURCE)
+    $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(.SOURCE)
 
 %_unittest : $(SRC_DIR)/%.o $(SRC_TESTDIR)/%_unittest.o gtest_main.a #unittest
-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -lpthread $^ -o $@
+    $(CXX) $(CPPFLAGS) $(CXXFLAGS) -lpthread $^ -o $@
 #	./$@.exe # launches the test - disabled, as failing tests stops the build
 # end pattern magic
 
 # gtest stuff
 gtest-all.o : $(GTEST_SRCS_)
-	$(CXX) $(CPPFLAGS) -I$(GTEST_DIR) $(CXXFLAGS) -c \
+    $(CXX) $(CPPFLAGS) -I$(GTEST_DIR) $(CXXFLAGS) -c \
             $(GTEST_DIR)/src/gtest-all.cc
             
 gtest_main.o : $(GTEST_SRCS_)
-	$(CXX) $(CPPFLAGS) -I$(GTEST_DIR) $(CXXFLAGS) -c \
+    $(CXX) $(CPPFLAGS) -I$(GTEST_DIR) $(CXXFLAGS) -c \
             $(GTEST_DIR)/src/gtest_main.cc
 
 gtest.a : gtest-all.o
-	$(AR) $(ARFLAGS) $@ $^
+    $(AR) $(ARFLAGS) $@ $^
 
 gtest_main.a : gtest-all.o gtest_main.o
-	$(AR) $(ARFLAGS) $@ $^
+    $(AR) $(ARFLAGS) $@ $^
 # end gtest stuff
\ No newline at end of file