Add test and clean target in Makefile.devel.

	修改：     ChangeLog
	修改：     FILELIST
	修改：     Makefile.devel

Author: ChenPi11

ChangeLog

@@ -5,6 +5,7 @@
 	Move 'lib/gen*.c' to 'tools/gen*.cpp'.
 	Optimize 'Makefile.devel'.
 	Move generated files to C++ to avoid 'register' warnings.
+	Add test and clean target in 'Makefile.devel'.
 
 2023-09-09  ChenPi11  <wushengwuxi-msctinoulk@outlook.com>
 

FILELIST

@@ -90,15 +90,13 @@ lib/tcvn.h
 lib/ebcdic1123.h
 lib/ebcdic1158.h
 lib/ucs2be.h
-lib/genaliases2.c
 lib/ebcdic425.h
 lib/cp1253.h
 lib/iconv_open1.h
 lib/ces_big5.h
 lib/cp857.h
 lib/cp949.h
 lib/ebcdic1137.h
-lib/genflags.c
 lib/iso8859_10.h
 lib/gb2312.h
 lib/cp936.h
@@ -163,7 +161,6 @@ lib/ebcdic1122.h
 lib/isoir165.h
 lib/cp864.h
 lib/iso8859_15.h
-lib/genaliases.c
 lib/mac_turkish.h
 lib/ebcdic424.h
 lib/uhc_1.h
@@ -528,6 +525,9 @@ tests/throw_error.hpp
 tests/file_utils.hpp
 tests/sort.cpp
 tests/sort.hpp
+tools/genaliases.cpp
+tools/genaliases2.cpp
+tools/genflags.cpp
 COPYING
 Makefile.devel
 include/cppp/reiconv.hpp.in

Makefile.devel

@@ -1,20 +1,17 @@
 # -*- makefile -*-
-# This is the developer's makefile, not the user's makefile.
-# Don't use it unless you know exactly what you do!
-# It requires GNU make.
-# It obeys the environment variables GNULIB_TOOL, CC, CFLAGS
-# if you have set them.
+# This is the developer's makefile.
+# It obeys the environment variables CXX, CFLAGS if you have set them.
 
-ifneq (,)
-This makefile requires GNU Make.
-endif
 
-SHELL = /bin/sh
 GPERF = gperf
+CMAKE = cmake
+CTEST = ctest
 MKDIR = mkdir -p
 RM = rm -f
 
-CFLAGS := $(CFLAGS) -Ilib
+CXX ?= g++ -Wall
+
+CXXFLAGS := $(CXXFLAGS) -Ilib
 
 all : lib/generated \
       lib/generated/aliases.h lib/generated/aliases_sysaix.h lib/generated/aliases_syshpux.h lib/generated/aliases_sysosf1.h lib/generated/aliases_syssolaris.h \
@@ -29,7 +26,7 @@ lib/generated :
 	$(MKDIR) lib/generated
 
 lib/generated/genaliases : tools/genaliases.cpp
-	$(CXX) $(CFLAGS) $< -o $@
+	$(CXX) $(CFLAGS) $(CXXFLAGS) $(LDFLAGS) $< -o $@
 
 lib/generated/aliases.gperf : lib/generated/genaliases
 	./lib/generated/genaliases $@
@@ -39,7 +36,7 @@ lib/generated/aliases.h : lib/generated/aliases.gperf
 
 
 lib/generated/genaliases_sysaix : tools/genaliases.cpp
-	$(CXX) $(CFLAGS) -DUSE_AIX_ALIASES $< -o $@
+	$(CXX) $(CFLAGS) $(CXXFLAGS) $(LDFLAGS) -DUSE_AIX_ALIASES $< -o $@
 
 lib/generated/aliases_sysaix.gperf : lib/generated/genaliases_sysaix
 	./lib/generated/genaliases_sysaix $@
@@ -49,7 +46,7 @@ lib/generated/aliases_sysaix.h : lib/generated/aliases_sysaix.gperf
 
 
 lib/generated/genaliases_syshpux : tools/genaliases.cpp
-	$(CXX) $(CFLAGS) -DUSE_HPUX_ALIASES $< -o $@
+	$(CXX) $(CFLAGS) $(CXXFLAGS) $(LDFLAGS) -DUSE_HPUX_ALIASES $< -o $@
 
 lib/generated/aliases_syshpux.gperf : lib/generated/genaliases_syshpux
 	./lib/generated/genaliases_syshpux $@
@@ -59,7 +56,7 @@ lib/generated/aliases_syshpux.h : lib/generated/aliases_syshpux.gperf
 
 
 lib/generated/genaliases_sysosf1 : tools/genaliases.cpp
-	$(CXX) $(CFLAGS) -DUSE_OSF1_ALIASES $< -o $@
+	$(CXX) $(CFLAGS) $(CXXFLAGS) $(LDFLAGS) -DUSE_OSF1_ALIASES $< -o $@
 
 lib/generated/aliases_sysosf1.gperf : lib/generated/genaliases_sysosf1
 	./lib/generated/genaliases_sysosf1 $@
@@ -69,7 +66,7 @@ lib/generated/aliases_sysosf1.h : lib/generated/aliases_sysosf1.gperf
 
 
 lib/generated/genaliases_syssolaris : tools/genaliases.cpp
-	$(CXX) $(CFLAGS) -DUSE_SOLARIS_ALIASES $< -o $@
+	$(CXX) $(CFLAGS) $(CXXFLAGS) $(LDFLAGS) -DUSE_SOLARIS_ALIASES $< -o $@
 
 lib/generated/aliases_syssolaris.gperf : lib/generated/genaliases_syssolaris
 	./lib/generated/genaliases_syssolaris $@
@@ -79,55 +76,92 @@ lib/generated/aliases_syssolaris.h : lib/generated/aliases_syssolaris.gperf
 
 
 lib/generated/genaliases2_aix : tools/genaliases2.cpp
-	$(CXX) $(CFLAGS) -DUSE_AIX $< -o $@
+	$(CXX) $(CFLAGS) $(CXXFLAGS) $(LDFLAGS) -DUSE_AIX $< -o $@
 
 lib/generated/aliases_aix.h : lib/generated/genaliases2_aix
 	./lib/generated/genaliases2_aix aix $@
 
 
 lib/generated/genaliases2_aix_sysaix : tools/genaliases2.cpp
-	$(CXX) $(CFLAGS) -DUSE_AIX -DUSE_AIX_ALIASES $< -o $@
+	$(CXX) $(CFLAGS) $(CXXFLAGS) $(LDFLAGS) -DUSE_AIX -DUSE_AIX_ALIASES $< -o $@
 
 lib/generated/aliases_aix_sysaix.h : lib/generated/genaliases2_aix_sysaix
 	./lib/generated/genaliases2_aix_sysaix aix $@
 
 
 lib/generated/genaliases2_osf1 : tools/genaliases2.cpp
-	$(CXX) $(CFLAGS) -DUSE_OSF1 $< -o $@
+	$(CXX) $(CFLAGS) $(CXXFLAGS) $(LDFLAGS) -DUSE_OSF1 $< -o $@
 
 lib/generated/aliases_osf1.h : lib/generated/genaliases2_osf1
 	./lib/generated/genaliases2_osf1 osf1 $@
 
 
 lib/generated/genaliases2_osf1_sysosf1 : tools/genaliases2.cpp
-	$(CXX) $(CFLAGS) -DUSE_OSF1 -DUSE_OSF1_ALIASES $< -o $@
+	$(CXX) $(CFLAGS) $(CXXFLAGS) $(LDFLAGS) -DUSE_OSF1 -DUSE_OSF1_ALIASES $< -o $@
 
 lib/generated/aliases_osf1_sysosf1.h : lib/generated/genaliases2_osf1_sysosf1
 	./lib/generated/genaliases2_osf1_sysosf1 osf1 $@
 
 
 lib/generated/genaliases2_dos : tools/genaliases2.cpp
-	$(CXX) $(CFLAGS) -DUSE_DOS $< -o $@
+	$(CXX) $(CFLAGS) $(CXXFLAGS) $(LDFLAGS) -DUSE_DOS $< -o $@
 
 lib/generated/aliases_dos.h : lib/generated/genaliases2_dos
 	./lib/generated/genaliases2_dos dos $@
 
 
 lib/generated/genaliases2_zos : tools/genaliases2.cpp
-	$(CXX) $(CFLAGS) -DUSE_ZOS $< -o $@
+	$(CXX) $(CFLAGS) $(CXXFLAGS) $(LDFLAGS) -DUSE_ZOS $< -o $@
 
 lib/generated/aliases_zos.h : lib/generated/genaliases2_zos
 	./lib/generated/genaliases2_zos zos $@
 
 
 lib/generated/genaliases2_extra : tools/genaliases2.cpp
-	$(CXX) $(CFLAGS) -DUSE_EXTRA $< -o $@
+	$(CXX) $(CFLAGS) $(CXXFLAGS) $(LDFLAGS) -DUSE_EXTRA $< -o $@
 
 lib/generated/aliases_extra.h : lib/generated/genaliases2_extra
 	./lib/generated/genaliases2_extra extra $@
 
 lib/generated/genflags : tools/genflags.cpp
-	$(CXX) $(CFLAGS) $< -o $@
+	$(CXX) $(CFLAGS) $(CXXFLAGS) $(LDFLAGS) $< -o $@
 
 lib/generated/flags.h : lib/generated/genflags
 	./lib/generated/genflags > $@
+
+test : all
+	$(RM) -r -f build
+	$(MKDIR) build
+	cd build && $(CMAKE) .. -DENABLE_EXTRA=ON -DENABLE_TEST=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=test_install
+	cd build && $(CMAKE) --build . --config=Release --verbose
+	cd build && $(CTEST) -C Release --verbose
+	$(CMAKE) --install build --verbose
+	./cpppdist.py
+	{ diff cppp-reiconv-* . --recursive || echo ; }
+
+# Alias to test
+check : test
+
+clean :
+	$(RM) -r build
+	$(RM) lib/generated/aliases.gperf
+	$(RM) lib/generated/aliases_sysaix.gperf
+	$(RM) lib/generated/aliases_syshpux.gperf
+	$(RM) lib/generated/aliases_sysosf1.gperf
+	$(RM) lib/generated/aliases_syssolaris.gperf
+	$(RM) lib/generated/genaliases
+	$(RM) lib/generated/genaliases2_aix
+	$(RM) lib/generated/genaliases2_aix_sysaix
+	$(RM) lib/generated/genaliases2_dos
+	$(RM) lib/generated/genaliases2_extra
+	$(RM) lib/generated/genaliases2_osf1
+	$(RM) lib/generated/genaliases2_osf1_sysosf1
+	$(RM) lib/generated/genaliases2_zos
+	$(RM) lib/generated/genaliases_sysaix
+	$(RM) lib/generated/genaliases_syshpux
+	$(RM) lib/generated/genaliases_sysosf1
+	$(RM) lib/generated/genaliases_syssolaris
+	$(RM) lib/generated/genflags
+	$(RM) tests/data/GB18030-2005.TXT
+	$(RM) tests/data/GB18030-2022.TXT
+	$(RM) tests/data/UTF-8.TXT