소스 검색

Merge branch 'maint'

* maint:
  Rename 'make check' to 'make test'
  Ignore buildbot directory

Conflicts:
	.gitignore
Bryan Drewery 14 년 전
부모
커밋
999bf2d5cd
3개의 변경된 파일6개의 추가작업 그리고 7개의 파일을 삭제
  1. 1 0
      .gitignore
  2. 3 3
      BSDmakefile
  3. 2 4
      Makefile.in

+ 1 - 0
.gitignore

@@ -21,3 +21,4 @@
 .*.sw*
 .hosts
 .resolv.conf
+.buildbot

+ 3 - 3
BSDmakefile

@@ -1,4 +1,4 @@
-.PHONY: default check_gmake debug static dynamic clean distclean check
+.PHONY: default check_gmake debug static dynamic clean distclean test
 
 default: check_gmake
 	@gmake
@@ -14,5 +14,5 @@ clean: check_gmake
 	@gmake clean
 distclean: check_gmake
 	@gmake distclean
-check:
-	@gmake check
+test:
+	@gmake test

+ 2 - 4
Makefile.in

@@ -85,9 +85,9 @@ MAKE_UTILS_NR = $(MAKE) 'CXX=$(CXX)' 'STRIP=touch' 'INCLUDES=$(INCLUDES)' \
 
 MAKE_CONFIG = $(MAKE) 'MAKE=$(MAKE)'
 
-.PHONY: checkclean.static checkclean.dynamic checkclean.debug lib wraith dwraith lib.debug debug check general crypto utils sorthelp makehelp makeset makeres stringfix set res help sort indent tar distrib distclean clean cleanutils test default dynamic static
+.PHONY: checkclean.static checkclean.dynamic checkclean.debug lib wraith dwraith lib.debug debug test general crypto utils sorthelp makehelp makeset makeres stringfix set res help sort indent tar distrib distclean clean cleanutils test all dynamic static
 
-default: dynamic
+all: dynamic
 
 test:
 
@@ -208,8 +208,6 @@ crypto:
 
 general: help res set stringfix
 
-check:
-
 .NOTPARALLEL: checkclean.static checkclean.dynamic checkclean.debug
 
 checkclean.static: