Skip to content

Commit d5b765d

Browse files
kwwettekwwette
committed
Whitespace cleanup of all Makefiles*
- some of the %.clean rules in the test-suite Makefiles were using a single tab as an empty rule, dangerous! I've replaced these with the safer '@EXIT 0'.
1 parent 7cd9063 commit d5b765d

33 files changed

+138
-167
lines changed

‎CCache/Makefile.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ distclean: clean
6969
maintainer-clean: distclean
7070
/bin/rm -f $(PACKAGE_NAME).1 web/ccache-man.html
7171

72-
72+
7373
# FIXME: To fix this, test.sh needs to be able to take ccache from the
7474
# installed prefix, not from the source dir.
75-
installcheck:
75+
installcheck:
7676
@echo "WARNING! This is not really \"installcheck\" yet."
7777
$(MAKE) check

‎Doc/Manual/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -75,4 +75,3 @@ linkchecker:
7575
@echo Note linkchecker versions prior to 6.1 do not work properly wrt anchors
7676
@echo -----------------------------------------------------------------------
7777
linkchecker --config=./linkchecker.config index.html
78-

‎Examples/Makefile.in

+3-3
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ endif
8888
##################################################################
8989

9090
CPP_DLLIBS = #-L/usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.7.2 \
91-
-L/usr/local/lib -lg++ -lstdc++ -lgcc
91+
-L/usr/local/lib -lg++ -lstdc++ -lgcc
9292

9393
# Solaris workshop 5.0
9494
# CPP_DLLIBS = -L/opt/SUNWspro/lib -lCrun
@@ -1621,7 +1621,7 @@ R_SCRIPT=$(RUNME).R
16211621
r: $(SRCS)
16221622
$(SWIG) -r $(SWIGOPT) $(INTERFACEPATH)
16231623
ifneq ($(SRCS),)
1624-
$(CC) -g -c $(CFLAGS) $(R_CFLAGS) $(SRCS) $(INCLUDES)
1624+
$(CC) -g -c $(CFLAGS) $(R_CFLAGS) $(SRCS) $(INCLUDES)
16251625
endif
16261626
+( PKG_CPPFLAGS="$(INCLUDES)" $(COMPILETOOL) $(R) CMD SHLIB -o $(LIBPREFIX)$(TARGET)$(SO) $(ISRCS) $(OBJS) > /dev/null )
16271627

@@ -1632,7 +1632,7 @@ endif
16321632
r_cpp: $(CXXSRCS)
16331633
$(SWIG) -c++ -r $(SWIGOPT) -o $(RCXXSRCS) $(INTERFACEPATH)
16341634
ifneq ($(CXXSRCS),)
1635-
$(CXX) -g -c $(CXXFLAGS) $(R_CFLAGS) $(CXXSRCS) $(INCLUDES)
1635+
$(CXX) -g -c $(CXXFLAGS) $(R_CFLAGS) $(CXXSRCS) $(INCLUDES)
16361636
endif
16371637
+( PKG_CPPFLAGS="$(INCLUDES)" $(COMPILETOOL) $(R) CMD SHLIB -o $(LIBPREFIX)$(TARGET)$(SO) $(RCXXSRCS) $(OBJS) > /dev/null )
16381638

‎Examples/test-suite/allegrocl/Makefile.in

+4-5
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ top_builddir = @top_builddir@
1212

1313
# these cpp tests generate warnings/errors when compiling
1414
# the wrapper .cxx file.
15-
CPP_TEST_BROKEN_CXX =
15+
CPP_TEST_BROKEN_CXX =
1616
# the error is wrap:action code generated by swig. \
1717
# error: can't convert [std::string] 'b' to 'bool' \
1818
# might just need a bool overload op for std::string. \
@@ -71,7 +71,7 @@ CPP_TEST_CASES_ACL_UNSUPPORTED = \
7171
extern_throws \
7272
throw_exception \
7373
using_pointers \
74-
74+
7575
C_TEST_CASES_ACL_BROKEN = \
7676
# 'cdate.i' module support \
7777
li_cdata \
@@ -96,7 +96,7 @@ include $(srcdir)/../common.mk
9696
# none!
9797

9898
# Rules for the different types of tests
99-
%.cpptest:
99+
%.cpptest:
100100
$(setup)
101101
+$(swig_and_compile_cpp)
102102
$(run_testcase)
@@ -106,7 +106,7 @@ include $(srcdir)/../common.mk
106106
+$(swig_and_compile_c)
107107
$(run_testcase)
108108

109-
%.multicpptest:
109+
%.multicpptest:
110110
$(setup)
111111
+$(swig_and_compile_multi_cpp)
112112
$(run_testcase)
@@ -123,4 +123,3 @@ run_testcase = \
123123

124124
clean:
125125
$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile allegrocl_clean
126-

‎Examples/test-suite/cffi/Makefile.in

+4-5
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ include $(srcdir)/../common.mk
1414
# Overridden variables here
1515
# no C++ tests for now
1616
CPP_TEST_CASES =
17-
#C_TEST_CASES +=
17+
#C_TEST_CASES +=
1818

1919
# Custom tests - tests with additional commandline options
2020
# none!
2121

2222
# Rules for the different types of tests
23-
%.cpptest:
23+
%.cpptest:
2424
$(setup)
2525
+$(swig_and_compile_cpp)
2626
$(run_testcase)
@@ -30,7 +30,7 @@ CPP_TEST_CASES =
3030
+$(swig_and_compile_c)
3131
$(run_testcase)
3232

33-
%.multicpptest:
33+
%.multicpptest:
3434
$(setup)
3535
+$(swig_and_compile_multi_cpp)
3636
$(run_testcase)
@@ -44,8 +44,7 @@ run_testcase = \
4444

4545
# Clean: (does nothing, we dont generate extra cffi code)
4646
%.clean:
47-
47+
@exit 0
4848

4949
clean:
5050
$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile cffi_clean
51-

‎Examples/test-suite/chicken/Makefile.in

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#######################################################################
44

55
LANGUAGE = chicken
6-
VARIANT =
6+
VARIANT =
77
SCRIPTSUFFIX = _runme.ss
88
PROXYSUFFIX = _runme_proxy.ss
99
srcdir = @srcdir@
@@ -17,7 +17,7 @@ SO = @SO@
1717
# Skip the STD cases for now, except for li_std_string.i
1818
SKIP_CPP_STD_CASES = Yes
1919

20-
CPP_TEST_CASES += li_std_string
20+
CPP_TEST_CASES += li_std_string
2121

2222
EXTRA_TEST_CASES += chicken_ext_test.externaltest
2323

@@ -39,7 +39,7 @@ SWIGOPT += -nounit
3939
%.multiproxy: SCRIPTSUFFIX = $(PROXYSUFFIX)
4040

4141
# Rules for the different types of tests
42-
%.cpptest:
42+
%.cpptest:
4343
$(setup)
4444
+$(swig_and_compile_cpp)
4545
$(run_testcase)
@@ -55,7 +55,7 @@ SWIGOPT += -nounit
5555
$(MAKE) $*.cproxy; \
5656
fi
5757

58-
%.multicpptest:
58+
%.multicpptest:
5959
$(setup)
6060
+$(swig_and_compile_multi_cpp)
6161
$(run_testcase)
@@ -92,7 +92,7 @@ run_testcase = \
9292

9393
# Clean
9494
%.clean:
95-
95+
@exit 0
9696

9797
clean:
9898
$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile chicken_clean

‎Examples/test-suite/clisp/Makefile.in

+4-5
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ include $(srcdir)/../common.mk
1414
# Overridden variables here
1515
# no C++ tests for now
1616
CPP_TEST_CASES =
17-
#C_TEST_CASES +=
17+
#C_TEST_CASES +=
1818

1919
# Custom tests - tests with additional commandline options
2020
# none!
2121

2222
# Rules for the different types of tests
23-
%.cpptest:
23+
%.cpptest:
2424
$(setup)
2525
+$(swig_and_compile_cpp)
2626
$(run_testcase)
@@ -30,7 +30,7 @@ CPP_TEST_CASES =
3030
+$(swig_and_compile_c)
3131
$(run_testcase)
3232

33-
%.multicpptest:
33+
%.multicpptest:
3434
$(setup)
3535
+$(swig_and_compile_multi_cpp)
3636
$(run_testcase)
@@ -44,8 +44,7 @@ run_testcase = \
4444

4545
# Clean: (does nothing, we dont generate extra clisp code)
4646
%.clean:
47-
47+
@exit 0
4848

4949
clean:
5050
$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile clisp_clean
51-

‎Examples/test-suite/csharp/Makefile.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ csharp_lib_arrays.cpptest: CSHARPFLAGSSPECIAL = -unsafe
4040
csharp_swig2_compatibility.cpptest: SWIGOPT += -DSWIG2_CSHARP
4141

4242
# Rules for the different types of tests
43-
%.cpptest:
43+
%.cpptest:
4444
$(setup)
4545
+(cd $* && $(swig_and_compile_cpp))
4646
+$(run_testcase)
@@ -50,7 +50,7 @@ csharp_swig2_compatibility.cpptest: SWIGOPT += -DSWIG2_CSHARP
5050
+(cd $* && $(swig_and_compile_c))
5151
+$(run_testcase)
5252

53-
%.multicpptest:
53+
%.multicpptest:
5454
$(setup)
5555
+(cd $* && $(swig_and_compile_multi_cpp))
5656
+$(run_testcase)

‎Examples/test-suite/errors/Makefile.in

+3-4
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ CPP_ERROR_TEST_CASES := $(filter cpp_%, $(ALL_ERROR_TEST_CASES))
2929
C_ERROR_TEST_CASES := $(filter-out $(CPP_ERROR_TEST_CASES), $(ALL_ERROR_TEST_CASES))
3030

3131
ERROR_TEST_CASES := $(CPP_ERROR_TEST_CASES:=.cpptest) \
32-
$(C_ERROR_TEST_CASES:=.ctest)
32+
$(C_ERROR_TEST_CASES:=.ctest)
3333

3434
include $(srcdir)/../common.mk
3535

3636

3737
# Rules for the different types of tests
38-
%.cpptest:
38+
%.cpptest:
3939
echo "$(ACTION)ing errors testcase $*"
4040
-$(SWIG) -c++ -python -Wall -Fstandard $(SWIGOPT) $*.i 2>&1 | $(TODOS) > $*.$(ERROR_EXT)
4141
$(COMPILETOOL) diff -c $*.stderr $*.$(ERROR_EXT)
@@ -46,9 +46,8 @@ include $(srcdir)/../common.mk
4646
$(COMPILETOOL) diff -c $*.stderr $*.$(ERROR_EXT)
4747

4848
%.clean:
49-
49+
@exit 0
5050

5151
clean:
5252
$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile $(LANGUAGE)_clean
5353
@rm -f *.$(ERROR_EXT) *.py
54-

‎Examples/test-suite/go/Makefile.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ include $(srcdir)/../common.mk
2929
.SUFFIXES: .cpptest .ctest .multicpptest
3030

3131
# Rules for the different types of tests
32-
%.cpptest:
32+
%.cpptest:
3333
$(setup)
3434
+$(swig_and_compile_cpp)
3535
$(run_testcase_cpp)
@@ -39,7 +39,7 @@ include $(srcdir)/../common.mk
3939
+$(swig_and_compile_c)
4040
$(run_testcase)
4141

42-
%.multicpptest:
42+
%.multicpptest:
4343
$(setup)
4444
+$(swig_and_compile_multi_cpp)
4545
$(run_multi_testcase)

‎Examples/test-suite/guile/Makefile.in

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ GUILE = @GUILE@
1414
GUILE_RUNTIME=
1515

1616
C_TEST_CASES = long_long \
17-
list_vector \
18-
multivalue \
19-
pointer_in_out
17+
list_vector \
18+
multivalue \
19+
pointer_in_out
2020

2121

2222
include $(srcdir)/../common.mk
@@ -28,7 +28,7 @@ INCLUDES += -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)/guile
2828
%.multicpptest: SWIGOPT += $(GUILE_RUNTIME)
2929

3030
# Rules for the different types of tests
31-
%.cpptest:
31+
%.cpptest:
3232
$(setup)
3333
+$(swig_and_compile_cpp)
3434
$(run_testcase)
@@ -38,7 +38,7 @@ INCLUDES += -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)/guile
3838
+$(swig_and_compile_c)
3939
$(run_testcase)
4040

41-
%.multicpptest:
41+
%.multicpptest:
4242
$(setup)
4343
+$(swig_and_compile_multi_cpp)
4444
$(run_testcase)

‎Examples/test-suite/java/Makefile.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ director_nspace.%: JAVA_PACKAGE = $*Package
5555
director_nspace_director_name_collision.%: JAVA_PACKAGE = $*Package
5656

5757
# Rules for the different types of tests
58-
%.cpptest:
58+
%.cpptest:
5959
$(setup)
6060
+(cd $(JAVA_PACKAGE) && $(swig_and_compile_cpp))
6161
$(run_testcase)
@@ -65,7 +65,7 @@ director_nspace_director_name_collision.%: JAVA_PACKAGE = $*Package
6565
+(cd $(JAVA_PACKAGE) && $(swig_and_compile_c))
6666
$(run_testcase)
6767

68-
%.multicpptest:
68+
%.multicpptest:
6969
$(setup)
7070
+(cd $(JAVA_PACKAGE) && $(swig_and_compile_multi_cpp))
7171
$(run_testcase)

‎Examples/test-suite/lua/Makefile.in

+5-5
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ LIBS = -L.
2828
lua_no_module_global.%: SWIGOPT += -nomoduleglobal
2929

3030
# Rules for the different types of tests
31-
%.cpptest:
31+
%.cpptest:
3232
$(setup)
3333
+$(swig_and_compile_cpp)
3434
$(run_testcase)
@@ -38,7 +38,7 @@ lua_no_module_global.%: SWIGOPT += -nomoduleglobal
3838
+$(swig_and_compile_c)
3939
$(run_testcase)
4040

41-
%.multicpptest:
41+
%.multicpptest:
4242
$(setup)
4343
+$(swig_and_compile_multi_cpp)
4444
$(run_testcase)
@@ -52,13 +52,13 @@ run_testcase = \
5252

5353
# Clean: (does nothing, we dont generate extra lua code)
5454
%.clean:
55-
55+
@exit 0
5656

5757
clean:
5858
$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile lua_clean
5959

6060
cvsignore:
6161
@echo '*wrap* *.so *.dll *.exp *.lib'
6262
@echo Makefile
63-
@for i in ${CPP_TEST_CASES} ${C_TEST_CASES}; do echo $$i.lua; done
64-
@for i in ${CPP_TEST_CASES} ${C_TEST_CASES}; do if grep -q $${i}_runme.lua CVS/Entries ; then echo $${i}_runme.lua; fi; done
63+
@for i in ${CPP_TEST_CASES} ${C_TEST_CASES}; do echo $$i.lua; done
64+
@for i in ${CPP_TEST_CASES} ${C_TEST_CASES}; do if grep -q $${i}_runme.lua CVS/Entries ; then echo $${i}_runme.lua; fi; done

‎Examples/test-suite/mzscheme/Makefile.in

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ include $(srcdir)/../common.mk
1818
# none!
1919

2020
# Rules for the different types of tests
21-
%.cpptest:
21+
%.cpptest:
2222
$(setup)
2323
+$(swig_and_compile_cpp)
2424
$(run_testcase)
@@ -28,7 +28,7 @@ include $(srcdir)/../common.mk
2828
+$(swig_and_compile_c)
2929
$(run_testcase)
3030

31-
%.multicpptest:
31+
%.multicpptest:
3232
$(setup)
3333
+$(swig_and_compile_multi_cpp)
3434
$(run_testcase)
@@ -42,7 +42,7 @@ run_testcase = \
4242

4343
# Clean
4444
%.clean:
45-
45+
@exit 0
4646

4747
clean:
4848
$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile mzscheme_clean

‎Examples/test-suite/ocaml/Makefile.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ srcdir = @srcdir@
1010
top_srcdir = @top_srcdir@
1111
top_builddir = @top_builddir@
1212

13-
C_TEST_CASES =
13+
C_TEST_CASES =
1414

1515
run_testcase = \
1616
if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) -a \
@@ -21,7 +21,7 @@ run_testcase = \
2121
$(COMPILETOOL) $(OCAMLC) -c $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX); \
2222
$(COMPILETOOL) $(OCAMLC) swig.cmo -custom -g -cc '$(CXX)' -o runme $(srcdir)/$(*).cmo $(srcdir)/$(*)_runme.cmo $(srcdir)/$(*)_wrap.o && \
2323
$(RUNTOOL) ./runme; \
24-
fi ;
24+
fi ;
2525

2626
check_quant:
2727
cat /dev/null > testing

0 commit comments

Comments
 (0)