From 9527e8a29da7bb8d2daa0aca64b1d6de690d2dec Mon Sep 17 00:00:00 2001 From: Matt Nordhoff Date: Wed, 12 Feb 2020 14:52:42 +0000 Subject: [PATCH] Deduplicate EXTRA_DIST and dist_doc_DATA in modified Makefile.ams --- modules/gmysqlbackend/Makefile.am | 9 +-------- modules/godbcbackend/Makefile.am | 5 +---- modules/gpgsqlbackend/Makefile.am | 8 +------- modules/gsqlite3backend/Makefile.am | 8 +------- 4 files changed, 4 insertions(+), 26 deletions(-) diff --git a/modules/gmysqlbackend/Makefile.am b/modules/gmysqlbackend/Makefile.am index 1845a453d4..44f1b354ed 100644 --- a/modules/gmysqlbackend/Makefile.am +++ b/modules/gmysqlbackend/Makefile.am @@ -4,14 +4,7 @@ pkglib_LTLIBRARIES = libgmysqlbackend.la EXTRA_DIST = \ OBJECTFILES \ - OBJECTLIBS \ - dnssec-3.x_to_3.4.0_schema.mysql.sql \ - enable-foreign-keys.mysql.sql \ - nodnssec-3.x_to_3.4.0_schema.mysql.sql \ - 3.4.0_to_4.1.0_schema.mysql.sql \ - 4.1.0_to_4.2.0_schema.mysql.sql \ - 4.2.0_to_4.3.0_schema.mysql.sql \ - schema.mysql.sql + OBJECTLIBS dist_doc_DATA = \ dnssec-3.x_to_3.4.0_schema.mysql.sql \ diff --git a/modules/godbcbackend/Makefile.am b/modules/godbcbackend/Makefile.am index e070cb1053..9884e3df0f 100644 --- a/modules/godbcbackend/Makefile.am +++ b/modules/godbcbackend/Makefile.am @@ -3,10 +3,7 @@ pkglib_LTLIBRARIES = libgodbcbackend.la EXTRA_DIST = \ OBJECTFILES \ - OBJECTLIBS \ - schema.mssql.sql \ - 4.0.0_to_4.2.0_schema.mssql.sql \ - 4.2.0_to_4.3.0_schema.mssql.sql + OBJECTLIBS dist_doc_DATA = \ schema.mssql.sql \ diff --git a/modules/gpgsqlbackend/Makefile.am b/modules/gpgsqlbackend/Makefile.am index 7305477102..e1ca64df7f 100644 --- a/modules/gpgsqlbackend/Makefile.am +++ b/modules/gpgsqlbackend/Makefile.am @@ -3,13 +3,7 @@ pkglib_LTLIBRARIES = libgpgsqlbackend.la EXTRA_DIST = \ OBJECTFILES \ - OBJECTLIBS \ - 3.4.0_to_4.1.0_schema.pgsql.sql \ - 4.1.0_to_4.2.0_schema.pgsql.sql \ - 4.2.0_to_4.3.0_schema.pgsql.sql \ - dnssec-3.x_to_3.4.0_schema.pgsql.sql \ - nodnssec-3.x_to_3.4.0_schema.pgsql.sql \ - schema.pgsql.sql + OBJECTLIBS dist_doc_DATA = \ schema.pgsql.sql \ diff --git a/modules/gsqlite3backend/Makefile.am b/modules/gsqlite3backend/Makefile.am index 317dc9e7b8..2a83677380 100644 --- a/modules/gsqlite3backend/Makefile.am +++ b/modules/gsqlite3backend/Makefile.am @@ -2,13 +2,7 @@ pkglib_LTLIBRARIES = libgsqlite3backend.la EXTRA_DIST = \ OBJECTFILES \ - OBJECTLIBS \ - dnssec-3.x_to_3.4.0_schema.sqlite3.sql \ - nodnssec-3.x_to_3.4.0_schema.sqlite3.sql \ - 3.4.0_to_4.0.0_schema.sqlite3.sql \ - 4.0.0_to_4.2.0_schema.sqlite3.sql \ - 4.2.0_to_4.3.0_schema.sqlite3.sql \ - schema.sqlite3.sql + OBJECTLIBS dist_doc_DATA = \ dnssec-3.x_to_3.4.0_schema.sqlite3.sql \ -- 2.47.2