[Olsr-dev] [PATCH v2 1/1] Makefiles: define UNINSTALL_LIB macro

Ferry Huberts (spam-protected)
Tue Jul 26 09:13:11 CEST 2011


From: Ferry Huberts <(spam-protected)>

Signed-off-by: Ferry Huberts <(spam-protected)>
---
 make/Makefile.android |    2 ++
 make/Makefile.fbsd    |    2 ++
 make/Makefile.kfbsd   |    1 +
 make/Makefile.linux   |    2 ++
 make/Makefile.nbsd    |    2 ++
 make/Makefile.obsd    |    2 ++
 make/Makefile.osx     |    1 +
 make/Makefile.win32   |    1 +
 8 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/make/Makefile.android b/make/Makefile.android
index 74c6fce..e323ec8 100644
--- a/make/Makefile.android
+++ b/make/Makefile.android
@@ -73,6 +73,8 @@ endif
 PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER)
 INSTALL_LIB =	install -D -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME); \
 		/sbin/ldconfig -n $(LIBDIR)
+UNINSTALL_LIB =	rm -f $(LIBDIR)/$(PLUGIN_FULLNAME); \
+		/sbin/ldconfig -n $(LIBDIR)
 
 ifdef OLSRD_PLUGIN
 GENERATE_PIC = true
diff --git a/make/Makefile.fbsd b/make/Makefile.fbsd
index d3eb242..67074c8 100644
--- a/make/Makefile.fbsd
+++ b/make/Makefile.fbsd
@@ -35,6 +35,8 @@ endif
 PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER)
 INSTALL_LIB =	install -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME); \
 		/sbin/ldconfig
+UNINSTALL_LIB =	rm -f $(LIBDIR)/$(PLUGIN_FULLNAME); \
+		/sbin/ldconfig
 
 OS_LIB_PTHREAD = -pthread
 OS_CFLAG_PTHREAD = -pthread
diff --git a/make/Makefile.kfbsd b/make/Makefile.kfbsd
index 68bdbf9..b2841ae 100644
--- a/make/Makefile.kfbsd
+++ b/make/Makefile.kfbsd
@@ -36,6 +36,7 @@ endif
 
 PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER)
 INSTALL_LIB =	install -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME);
+UNINSTALL_LIB =	rm -f $(LIBDIR)/$(PLUGIN_FULLNAME);
 
 OS_LIB_PTHREAD = -pthread
 OS_CFLAG_PTHREAD = -pthread
diff --git a/make/Makefile.linux b/make/Makefile.linux
index c75d69a..3292258 100644
--- a/make/Makefile.linux
+++ b/make/Makefile.linux
@@ -15,6 +15,8 @@ LIBS +=
 PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER)
 INSTALL_LIB =	install -D -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME); \
 		/sbin/ldconfig -n $(LIBDIR)
+UNINSTALL_LIB =	rm -f $(LIBDIR)/$(PLUGIN_FULLNAME); \
+		/sbin/ldconfig -n $(LIBDIR)
 
 ifdef OLSRD_PLUGIN
 GENERATE_PIC = true
diff --git a/make/Makefile.nbsd b/make/Makefile.nbsd
index 474fc2a..4d655f3 100644
--- a/make/Makefile.nbsd
+++ b/make/Makefile.nbsd
@@ -14,6 +14,8 @@ LIBS +=
 PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER)
 INSTALL_LIB =	install -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME); \
 		/sbin/ldconfig
+UNINSTALL_LIB =	rm -f $(LIBDIR)/$(PLUGIN_FULLNAME); \
+		/sbin/ldconfig
 
 ifdef OLSRD_PLUGIN
 CFLAGS +=	-fPIC
diff --git a/make/Makefile.obsd b/make/Makefile.obsd
index d844e6b..ea2c1e0 100644
--- a/make/Makefile.obsd
+++ b/make/Makefile.obsd
@@ -14,6 +14,8 @@ LIBS +=
 PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER)
 INSTALL_LIB =	install -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME); \
 		/sbin/ldconfig
+UNINSTALL_LIB =	rm -f $(LIBDIR)/$(PLUGIN_FULLNAME); \
+		/sbin/ldconfig
 
 ifdef OLSRD_PLUGIN
 CFLAGS +=	-fPIC
diff --git a/make/Makefile.osx b/make/Makefile.osx
index 43547ea..a74dc16 100644
--- a/make/Makefile.osx
+++ b/make/Makefile.osx
@@ -17,6 +17,7 @@ LIBS +=
 
 PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER)
 INSTALL_LIB =	install -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME)
+UNINSTALL_LIB =	rm -f $(LIBDIR)/$(PLUGIN_FULLNAME)
 
 ifdef OLSRD_PLUGIN
 LDFLAGS = -bundle -flat_namespace -undefined suppress
diff --git a/make/Makefile.win32 b/make/Makefile.win32
index 946939d..7e4fbf5 100644
--- a/make/Makefile.win32
+++ b/make/Makefile.win32
@@ -15,6 +15,7 @@ CFLAGS +=	-mno-cygwin
 
 PLUGIN_FULLNAME ?= $(PLUGIN_NAME).dll
 INSTALL_LIB =	cp $(PLUGIN_FULLNAME) ../..
+UNINSTALL_LIB =	del /F $(PLUGIN_FULLNAME)
 
 ifdef OLSRD_PLUGIN
 LDFLAGS +=	-L$(TOPDIR)
-- 
1.7.6





More information about the Olsr-dev mailing list