diff --git a/.gitignore b/.gitignore index 48ea0f1..265e595 100644 --- a/.gitignore +++ b/.gitignore @@ -79,7 +79,7 @@ po/remove-potcdate.sed po/stamp-po src/psl2c src/suffixes.c -src/suffixes_dafsa.c +src/suffixes_dafsa.h stamp-h1 test-driver tests/*.log diff --git a/msvc/build-rules-msvc.mak b/msvc/build-rules-msvc.mak index 78923b7..c0263ab 100644 --- a/msvc/build-rules-msvc.mak +++ b/msvc/build-rules-msvc.mak @@ -24,8 +24,8 @@ $< $< << -# Make sure we generate suffixes_dafsa.c before trying to compile psl.c -$(CFG)\$(PLAT)\libpsl\psl.obj: $(CFG)\$(PLAT)\libpsl\suffixes_dafsa.c +# Make sure we generate suffixes_dafsa.h before trying to compile psl.c +$(CFG)\$(PLAT)\libpsl\psl.obj: $(CFG)\$(PLAT)\libpsl\suffixes_dafsa.h # Inference rules for building the test programs # Used for programs with a single source file. @@ -104,7 +104,7 @@ clean: @-del /f /q $(CFG)\$(PLAT)\*.ilk @-if exist $(CFG)\$(PLAT)\tests del /f /q $(CFG)\$(PLAT)\tests\*.obj @-del /f /q $(CFG)\$(PLAT)\libpsl\*.obj - @-del /f /q $(CFG)\$(PLAT)\libpsl\suffixes_dafsa.c + @-del /f /q $(CFG)\$(PLAT)\libpsl\suffixes_dafsa.h @-del /f /q ..\config.h @-del /f /q vc$(PDBVER)0.pdb @-rmdir /s /q $(CFG)\$(PLAT) diff --git a/msvc/generate-msvc.mak b/msvc/generate-msvc.mak index 2fd7697..a778fa8 100644 --- a/msvc/generate-msvc.mak +++ b/msvc/generate-msvc.mak @@ -9,7 +9,7 @@ $(CFG)\$(PLAT)\psl \ $(CFG)\$(PLAT)\tests: @-md $@ -$(CFG)\$(PLAT)\libpsl\suffixes_dafsa.c: $(CFG)\$(PLAT)\libpsl $(PSL_FILE) ..\src\psl-make-dafsa +$(CFG)\$(PLAT)\libpsl\suffixes_dafsa.h: $(CFG)\$(PLAT)\libpsl $(PSL_FILE) ..\src\psl-make-dafsa @echo Generating $@ $(PYTHON) ..\src\psl-make-dafsa --output-format=cxx+ "$(PSL_FILE_INPUT)" $@ diff --git a/src/Makefile.am b/src/Makefile.am index 5b5e765..f9c0a3d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,10 +1,10 @@ include libpsl-srcs.mk # suffixes.c must be created before psl.c is compiled -BUILT_SOURCES = suffixes_dafsa.c +BUILT_SOURCES = suffixes_dafsa.h # suffixes.c is a built source that must be cleaned -CLEANFILES = suffixes_dafsa.c +CLEANFILES = suffixes_dafsa.h lib_LTLIBRARIES = libpsl.la @@ -18,8 +18,8 @@ libpsl_la_LDFLAGS = -no-undefined -version-info $(LIBPSL_SO_VERSION) # Build rule for suffix_dafsa.c # PSL_FILE can be set by ./configure --with-psl-file=[PATH] -suffixes_dafsa.c: $(PSL_FILE) $(srcdir)/psl-make-dafsa - $(srcdir)/psl-make-dafsa --output-format=cxx+ "$(PSL_FILE)" suffixes_dafsa.c +suffixes_dafsa.h: $(PSL_FILE) $(srcdir)/psl-make-dafsa + $(srcdir)/psl-make-dafsa --output-format=cxx+ "$(PSL_FILE)" suffixes_dafsa.h EXTRA_DIST = psl-make-dafsa LICENSE.chromium diff --git a/src/psl.c b/src/psl.c index 246ac2e..1665293 100644 --- a/src/psl.c +++ b/src/psl.c @@ -159,7 +159,7 @@ struct psl_ctx_st { /* include the PSL data generated by psl-make-dafsa */ #if defined(BUILTIN_GENERATOR_LIBICU) || defined(BUILTIN_GENERATOR_LIBIDN2) || defined(BUILTIN_GENERATOR_LIBIDN) -#include "suffixes_dafsa.c" +#include "suffixes_dafsa.h" #else static const unsigned char kDafsa[] = ""; static time_t _psl_file_time = 0;