X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Frelocatable-prog;h=72bc2537782d2c34b60cc5c735017a38fac253b3;hb=7ef6c64e210ac0979d7e8ac69bc5b5208c2405ab;hp=6029b7c7831cac0caf2db026eb278c29fb6a59f6;hpb=4f1ef93bb87111c89562d136d07e0278c12dca5b;p=gnulib.git

diff --git a/modules/relocatable-prog b/modules/relocatable-prog
index 6029b7c78..72bc25377 100644
--- a/modules/relocatable-prog
+++ b/modules/relocatable-prog
@@ -11,6 +11,7 @@ lib/relocatable.c
 lib/progreloc.c
 m4/relocatable.m4
 m4/relocatable-lib.m4
+m4/lib-ld.m4
 
 Depends-on:
 relocatable-prog-wrapper
@@ -20,17 +21,36 @@ xalloc
 xreadlink
 stdbool
 unistd
+memcmp
+strdup
 
 configure.ac:
 gl_RELOCATABLE([$gl_source_base])
+if test $RELOCATABLE = yes; then
+  AC_LIBOBJ([progreloc])
+  AC_LIBOBJ([relocatable])
+fi
 
 Makefile.am:
-DEFS += -DEXEEXT=\"$(EXEEXT)\"
-lib_SOURCES += progreloc.c
+DEFS += -DEXEEXT=\"@EXEEXT@\"
+if RELOCATABLE_VIA_WRAPPER
+uninstall-hook: uninstall-relocwrapper
+uninstall-relocwrapper:
+	if test $(RELOCATABLE) = yes; then \
+	  case '$(EXEEXT)' in \
+	    .bin*) ;; \
+	    *) cd $(top_builddir) && \
+	       $(MAKE) $(AM_MAKEFLAGS) EXEEXT=.bin$(EXEEXT) \
+		       AM_MAKEFLAGS='$(AM_MAKEFLAGS) EXEEXT=.bin$(EXEEXT)' \
+		       uninstall ;; \
+	  esac; \
+	fi
+.PHONY: uninstall-relocwrapper
+endif
 
 Include:
-#include "relocatable.h"
-#include "progname.h"
+"relocatable.h"
+"progname.h"
 
 License:
 GPL