Skip to content

Commit 35d28bf

Browse files
authored
Merge pull request #76 from bodea/main
Stop installing multiple copies of the shared library.
2 parents efa2231 + 5824715 commit 35d28bf

File tree

11 files changed

+4
-205
lines changed

11 files changed

+4
-205
lines changed

Makefile

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
CC ?= gcc
22
CFLAGS ?= -Wall -Wstrict-prototypes
33
CFLAGS += -fPIC
4-
LIBRARY=libnss_cache.so
4+
LIBRARY=libnss_cache.so.2
55
PREFIX=$(DESTDIR)/usr
66
LIBDIR=$(PREFIX)/lib
7-
SONAME=libnss_cache.so.2
8-
LD_SONAME=-Wl,-soname,$(SONAME)
97
TESTDATA=.testdata
108

119
LIBNSSCACHE = nss_cache.o compat/getpwent_r.o compat/getgrent_r.o
@@ -119,24 +117,18 @@ $(GETENT_DATA_TOUCH): scripts/gentestdata.sh
119117

120118
last_pw_errno_test: test/last_pw_errno_test.c
121119

122-
$(LIBRARY): LDFLAGS += -shared $(LD_SONAME)
120+
$(LIBRARY): LDFLAGS += -shared
123121
$(LIBRARY): $(LIBNSSCACHE)
124122
$(CC) $(CFLAGS) $(LDFLAGS) -o $(LIBRARY) $+
125123

126-
$(SONAME): $(LIBRARY)
127-
ln -sf $(LIBRARY) $(SONAME)
128-
ln -sf $(LIBRARY) $(SONAME).0
129-
130124
.PHONY: install
131-
install: $(SONAME)
125+
install: $(LIBRARY)
132126
install -d $(LIBDIR)
133127
install $(LIBRARY) $(LIBDIR)
134-
install $(SONAME) $(LIBDIR)
135-
install $(SONAME).0 $(LIBDIR)
136128

137129
.PHONY: clean
138130
clean:
139-
rm -f $(LIBRARY)* *.o compat/*.o *.gcov *.gcda *.gcno compat/*.gcda compat/*.gcno lookup gen_getent last_pw_errno_test
131+
rm -f $(LIBRARY) *.o compat/*.o *.gcov *.gcda *.gcno compat/*.gcda compat/*.gcno lookup gen_getent last_pw_errno_test
140132

141133
.PHONY: veryclean
142134
veryclean: clean

debian/changelog

Lines changed: 0 additions & 116 deletions
This file was deleted.

debian/control

Lines changed: 0 additions & 21 deletions
This file was deleted.

debian/copyright

Lines changed: 0 additions & 25 deletions
This file was deleted.

debian/gbp.conf

Lines changed: 0 additions & 4 deletions
This file was deleted.

debian/lintian-overrides

Lines changed: 0 additions & 2 deletions
This file was deleted.

debian/rules

Lines changed: 0 additions & 19 deletions
This file was deleted.

debian/source/format

Lines changed: 0 additions & 1 deletion
This file was deleted.

debian/source/local-options

Lines changed: 0 additions & 1 deletion
This file was deleted.

debian/source/options

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)