(libnss_db-dbs): Renamed from libnss_db-routines. Remove db-open. Change all

uses.
(libnss_db-routines): Define as $(libnss_db-dbs) db-open.

diff --git a/nss/Makefile b/nss/Makefile
index 7f546f8..5e94c34 100644 (file)
--- a/nss/Makefile
+++ b/nss/Makefile
@@ -64,11 +64,11 @@ vpath %.c $(subdir-dirs)
 libnss_files-routines  := $(addprefix files-,$(databases))
 distribute             += files-XXX.c files-parse.c
 
 libnss_files-routines  := $(addprefix files-,$(databases))
 distribute             += files-XXX.c files-parse.c
 

-libnss_db-routines     := $(addprefix db-,$(filter-out hosts network key,\
+libnss_db-dbs          := $(addprefix db-,$(filter-out hosts network key,\

                                                        $(databases))) \
                                                        $(databases))) \

-                          db-open
+libnss_db-routines     := $(libnss_db-dbs) db-open

 generated              += $(filter-out db-alias.c db-netgrp.c, \
 generated              += $(filter-out db-alias.c db-netgrp.c, \

-                                       $(addsuffix .c,$(libnss_db-routines)))
+                                       $(addsuffix .c,$(libnss_db-dbs)))

 distribute             += $(addprefix nss_db/, db-XXX.c nss_db.h dummy-db.h)
 
 
 distribute             += $(addprefix nss_db/, db-XXX.c nss_db.h dummy-db.h)
 
 


@@ -85,7 +85,7 @@ include ../Rules
 
 $(objpfx)libnss_db.so: $(objpfx)libnss_files.so $(libdl)
 
 
 $(objpfx)libnss_db.so: $(objpfx)libnss_files.so $(libdl)
 

-$(libnss_db-routines:%=$(objpfx)%.c): $(objpfx)db-%.c: nss_files/files-%.c
+$(libnss_db-dbs:%=$(objpfx)%.c): $(objpfx)db-%.c: nss_files/files-%.c

        @rm -f $@.new
        (echo '#define EXTERN_PARSER';\
         echo '#define GENERIC "../nss_db/db-XXX.c"';\
        @rm -f $@.new
        (echo '#define EXTERN_PARSER';\
         echo '#define GENERIC "../nss_db/db-XXX.c"';\