From ea1f4bf0d824dac4f43e181c811f9b741f776477 Mon Sep 17 00:00:00 2001
From: "Andrew G. Morgan" <morgan@kernel.org>
Date: Tue, 2 Feb 2021 22:01:39 -0800
Subject: Drop all symlinks from the repository

Where we need symlinks we now create them as part of the make process.

Signed-off-by: Andrew G. Morgan <morgan@kernel.org>
---
 libcap/Makefile                  | 15 ++++++++++-----
 libcap/include/sys/.gitignore    |  1 +
 libcap/include/sys/psx_syscall.h |  1 -
 libcap/psx_syscall.h             |  1 -
 4 files changed, 11 insertions(+), 7 deletions(-)
 create mode 100644 libcap/include/sys/.gitignore
 delete mode 120000 libcap/include/sys/psx_syscall.h
 delete mode 120000 libcap/psx_syscall.h

(limited to 'libcap')

diff --git a/libcap/Makefile b/libcap/Makefile
index 8bf98a6..9563d88 100644
--- a/libcap/Makefile
+++ b/libcap/Makefile
@@ -88,8 +88,8 @@ $(STACAPLIBNAME): $(CAPOBJS)
 	$(AR) rcs $@ $^
 	$(RANLIB) $@
 
-$(STAPSXLIBNAME): $(PSXOBJS)
-	$(AR) rcs $@ $^
+$(STAPSXLIBNAME): $(PSXOBJS) include/sys/psx_syscall.h
+	$(AR) rcs $@ $(PSXOBJS)
 	$(RANLIB) $@
 
 ifeq ($(SHARED),yes)
@@ -98,8 +98,8 @@ $(CAPLIBNAME) $(MAJCAPLIBNAME) $(MINCAPLIBNAME): $(CAPOBJS)
 	ln -sf $(MINCAPLIBNAME) $(MAJCAPLIBNAME)
 	ln -sf $(MAJCAPLIBNAME) $(CAPLIBNAME)
 
-$(PSXLIBNAME) $(MAJPSXLIBNAME) $(MINPSXLIBNAME): $(PSXOBJS)
-	$(LD) $(CFLAGS) $(LDFLAGS) -Wl,-soname,$(MAJPSXLIBNAME) -o $(MINPSXLIBNAME) $^ $(PSXLINKFLAGS)
+$(PSXLIBNAME) $(MAJPSXLIBNAME) $(MINPSXLIBNAME): $(PSXOBJS) include/sys/psx_syscall.h
+	$(LD) $(CFLAGS) $(LDFLAGS) -Wl,-soname,$(MAJPSXLIBNAME) -o $(MINPSXLIBNAME) $(PSXOBJS) $(PSXLINKFLAGS)
 	ln -sf $(MINPSXLIBNAME) $(MAJPSXLIBNAME)
 	ln -sf $(MAJPSXLIBNAME) $(PSXLIBNAME)
 endif
@@ -167,7 +167,11 @@ install-common-cap: install-common libcap.pc
 	install -m 0644 include/sys/capability.h $(FAKEROOT)$(INCDIR)/sys
 	install -m 0644 libcap.pc $(FAKEROOT)$(PKGCONFIGDIR)/libcap.pc
 
-install-common-psx: install-common libpsx.pc
+include/sys/psx_syscall.h: ../psx/psx_syscall.h
+	rm -f $@
+	ln -s ../../../psx/psx_syscall.h $@
+
+install-common-psx: install-common libpsx.pc include/sys/psx_syscall.h
 	install -m 0644 include/sys/psx_syscall.h $(FAKEROOT)$(INCDIR)/sys
 	install -m 0644 libpsx.pc $(FAKEROOT)$(PKGCONFIGDIR)/libpsx.pc
 
@@ -181,4 +185,5 @@ clean:
 	rm -f $(CAPOBJS) $(CAPLIBNAME)* $(STACAPLIBNAME) libcap.pc
 	rm -f $(PSXOBJS) $(PSXLIBNAME)* $(STAPSXLIBNAME) libpsx.pc
 	rm -f cap_names.h cap_names.list.h _makenames $(GPERF_OUTPUT) cap_test
+	rm -f include/sys/psx_syscall.h
 	cd include/sys && $(LOCALCLEAN)
diff --git a/libcap/include/sys/.gitignore b/libcap/include/sys/.gitignore
new file mode 100644
index 0000000..595fc39
--- /dev/null
+++ b/libcap/include/sys/.gitignore
@@ -0,0 +1 @@
+psx_syscall.h
diff --git a/libcap/include/sys/psx_syscall.h b/libcap/include/sys/psx_syscall.h
deleted file mode 120000
index ebac5fe..0000000
--- a/libcap/include/sys/psx_syscall.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../psx/psx_syscall.h
\ No newline at end of file
diff --git a/libcap/psx_syscall.h b/libcap/psx_syscall.h
deleted file mode 120000
index dc748bb..0000000
--- a/libcap/psx_syscall.h
+++ /dev/null
@@ -1 +0,0 @@
-include/sys/psx_syscall.h
\ No newline at end of file
-- 
cgit v1.2.3