瀏覽代碼

Revert "Fix identation"

This reverts commit 0ebbcc602cbb75e8baa72eae6c25584fec119fc1.
S.Hentges 4 年之前
父節點
當前提交
0ae7e24470
共有 1 個文件被更改,包括 59 次插入59 次删除
  1. 59 59
      makefile

+ 59 - 59
makefile

@@ -32,8 +32,8 @@ UNITTEST_SOURCES := test/unittest/test_main.cpp
                     test/unittest/shellmatta_utils/test_utils_forwardCursor.cpp         \
                     test/unittest/shellmatta_utils/test_utils_clearInput.cpp            \
                     test/unittest/shellmatta_utils/test_utils_insertChars.cpp           \
-                    test/unittest/shellmatta_utils/test_utils_terminateInput.cpp        \
-                    test/unittest/shellmatta_utils/test_utils_removeChars.cpp           \
+                    test/unittest/shellmatta_utils/test_utils_terminateInput.cpp  		\
+					test/unittest/shellmatta_utils/test_utils_removeChars.cpp      		\
                     test/unittest/shellmatta_autocomplete/test_autocomplete_run.cpp     \
                     test/unittest/shellmatta_escape/test_escape_processArrowKeys.cpp    \
                     test/unittest/shellmatta_history/test_appendHistoryByte.cpp         \
@@ -73,87 +73,87 @@ DEPS    := $(OBJ:%.o=%.d)
 export
 
 help:
-    @echo Shellmatta help
-    @echo -----------------------------------------------
-    @echo test      - run all tests
-    @echo cppcheck  - run static code analysis (cppcheck)
-    @echo example   - build example
-    @echo -----------------------------------------------
+	@echo Shellmatta help
+	@echo -----------------------------------------------
+	@echo test      - run all tests
+	@echo cppcheck  - run static code analysis (cppcheck)
+	@echo example   - build example
+	@echo -----------------------------------------------
 
 test: unittest integrationtest
 
 cppcheck:
-    - @mkdir -p output/cppcheck/html
-    cppcheck --enable=all --template=gcc --cppcheck-build-dir=output/cppcheck $(SOURCES)
-    cppcheck --enable=all --template=gcc --cppcheck-build-dir=output/cppcheck $(SOURCES) --xml 2>output/cppcheck/cppcheck.xml
-    cppcheck-htmlreport --file=output/cppcheck/cppcheck.xml --title="Shellmatta" --report-dir=output/cppcheck/html
+	- @mkdir -p output/cppcheck/html
+	cppcheck --enable=all --template=gcc --cppcheck-build-dir=output/cppcheck $(SOURCES)
+	cppcheck --enable=all --template=gcc --cppcheck-build-dir=output/cppcheck $(SOURCES) --xml 2>output/cppcheck/cppcheck.xml
+	cppcheck-htmlreport --file=output/cppcheck/cppcheck.xml --title="Shellmatta" --report-dir=output/cppcheck/html
 
 unittest: $(UNITTEST_TARGET)
-    - @mkdir -p output/test/unittest/report
-    @echo running test:
-    @# remove coverage from former run
-    @-find . -name "*.gcda" -type f -delete
-    -$(UNITTEST_TARGET)
-    @#gcov -o output/test/unittest $(UNITTEST_CPPOBJ) -r src
-
-    @# remove report from former run
-    -rm -rf $(OBJ_DIR)test/unittest/report/*
-    gcovr --html-details --output $(OBJ_DIR)test/unittest/report/report.html output/test/unittest -f src -f api
-    @#-rm *.gcov
-    
+	- @mkdir -p output/test/unittest/report
+	@echo running test:
+	@# remove coverage from former run
+	@-find . -name "*.gcda" -type f -delete
+	-$(UNITTEST_TARGET)
+	@#gcov -o output/test/unittest $(UNITTEST_CPPOBJ) -r src
+
+	@# remove report from former run
+	-rm -rf $(OBJ_DIR)test/unittest/report/*
+	gcovr --html-details --output $(OBJ_DIR)test/unittest/report/report.html output/test/unittest -f src -f api
+	@#-rm *.gcov
+	
 integrationtest: $(INTEGRATIONTEST_TARGET)
-    - @mkdir -p output/test/integrationtest/report
-    @echo running test:
-    -$(INTEGRATIONTEST_TARGET)
-    #gcov -o output/test $(TEST_CPPOBJ) -r
-    gcovr --html-details --output $(OBJ_DIR)test/integrationtest/report/report.html output/src -f src -f api
-    #-rm *.gcov
-    
+	- @mkdir -p output/test/integrationtest/report
+	@echo running test:
+	-$(INTEGRATIONTEST_TARGET)
+	#gcov -o output/test $(TEST_CPPOBJ) -r
+	gcovr --html-details --output $(OBJ_DIR)test/integrationtest/report/report.html output/src -f src -f api
+	#-rm *.gcov
+	
 example: $(EXAMPLE_TARGET)
-    @echo building example
+	@echo building example
 
 doc:
-    - @mkdir -p output/doc/html
-    - @mkdir -p output/doc/latex
-    doxygen cfg/doxygen/doxyfile
-    
+	- @mkdir -p output/doc/html
+	- @mkdir -p output/doc/latex
+	doxygen cfg/doxygen/doxyfile
+	
 clean:
-    - rm -rf $(OBJ_DIR)
+	- rm -rf $(OBJ_DIR)
 
 $(EXAMPLE_TARGET): $(COBJ) $(EXAMPLE_COBJ)
-    - @mkdir -p $(@D)
-    $(CC) $(LFLAGS) $(LIB_PATH) -o $@ $^ $(LIBS)
+	- @mkdir -p $(@D)
+	$(CC) $(LFLAGS) $(LIB_PATH) -o $@ $^ $(LIBS)
 
 $(UNITTEST_TARGET): $(UNITTEST_CPPOBJ)
-    - @mkdir -p $(@D)
-    $(CPP) $(TESTLFLAGS) $(LIB_PATH) -o $@ $^ $(LIBS)
-    
+	- @mkdir -p $(@D)
+	$(CPP) $(TESTLFLAGS) $(LIB_PATH) -o $@ $^ $(LIBS)
+	
 $(INTEGRATIONTEST_TARGET): $(INTEGRATIONTEST_CPPOBJ) $(COBJ)
-    - @mkdir -p $(@D)
-    $(CPP) $(TESTLFLAGS) $(LIB_PATH) -o $@ $^ $(LIBS)
+	- @mkdir -p $(@D)
+	$(CPP) $(TESTLFLAGS) $(LIB_PATH) -o $@ $^ $(LIBS)
 
 $(TARGET): $(OBJ)
-    - @mkdir -p $(@D)
-    $(CC) $(LFLAGS) $(LIB_PATH) -o $@ $^ $(LIBS)
-    
+	- @mkdir -p $(@D)
+	$(CC) $(LFLAGS) $(LIB_PATH) -o $@ $^ $(LIBS)
+	
 $(COBJ):
-    - @mkdir -p $(@D)
-    @$(CC) -c $(CFLAGS)  $(DEPEND) -o $@  $(subst $(OBJ_DIR), ,$(@:%.o=%.c))
-    $(CC) -c $(CFLAGS) -o $@  $(subst $(OBJ_DIR), ,$(@:%.o=%.c))
+	- @mkdir -p $(@D)
+	@$(CC) -c $(CFLAGS)  $(DEPEND) -o $@  $(subst $(OBJ_DIR), ,$(@:%.o=%.c))
+	$(CC) -c $(CFLAGS) -o $@  $(subst $(OBJ_DIR), ,$(@:%.o=%.c))
 
 $(EXAMPLE_COBJ):
-    - @mkdir -p $(@D)
-    @$(CC) -c $(CFLAGS) $(DEPEND) -o $@  $(subst $(OBJ_DIR), ,$(@:%.o=%.c))
-    $(CC) -c $(CFLAGS) -o $@  $(subst $(OBJ_DIR), ,$(@:%.o=%.c))
+	- @mkdir -p $(@D)
+	@$(CC) -c $(CFLAGS) $(DEPEND) -o $@  $(subst $(OBJ_DIR), ,$(@:%.o=%.c))
+	$(CC) -c $(CFLAGS) -o $@  $(subst $(OBJ_DIR), ,$(@:%.o=%.c))
 
 $(UNITTEST_CPPOBJ) $(INTEGRATIONTEST_CPPOBJ):
-    - @mkdir -p $(@D)
-    @$(CPP) -c $(TESTFLAGS) $(DEPEND) -o $@  $(subst $(OBJ_DIR), ,$(@:%.o=%.cpp))
-    $(CPP) -c $(TESTFLAGS) -o $@  $(subst $(OBJ_DIR), ,$(@:%.o=%.cpp))
+	- @mkdir -p $(@D)
+	@$(CPP) -c $(TESTFLAGS) $(DEPEND) -o $@  $(subst $(OBJ_DIR), ,$(@:%.o=%.cpp))
+	$(CPP) -c $(TESTFLAGS) -o $@  $(subst $(OBJ_DIR), ,$(@:%.o=%.cpp))
 
 %.o: %.cpp
-    - @mkdir -p $(@D)
-    @$(CPP) -c $(CFLAGS) $(DEPEND) -o $@  $(subst $(OBJ_DIR), ,$(@:%.o=%.c))
-    $(CPP) -c $(CFLAGS) -o $@  $<
+	- @mkdir -p $(@D)
+	@$(CPP) -c $(CFLAGS) $(DEPEND) -o $@  $(subst $(OBJ_DIR), ,$(@:%.o=%.c))
+	$(CPP) -c $(CFLAGS) -o $@  $<
 
 -include $(DEPS)