+ * Dynamically linked clients now made with -l, so as to avoid rpath.

@@ -43,6 +43,8 @@
+  * Dynamically linked clients now made with -l, so as to avoid rpath.
+  * Do not use $^ in make rules (should help with non-GNU make).

diff --git a/changelog b/changelog
index b2bac0b8e92f47cd5864df13115977b362d78a1d..d4fe568232fdf78d1f8dedfce56a666805deee1a 100644 (file)
--- a/changelog
+++ b/changelog
@@ -43,6 +43,8 @@ adns (0.5) unstable; urgency=high
   * Don't complain so much about poll(2) tests if not available.
   * Do not give -u 0 -g 0 options to install.
   * Remove trailing , from some enums in adns.h.
   * Don't complain so much about poll(2) tests if not available.
   * Do not give -u 0 -g 0 options to install.
   * Remove trailing , from some enums in adns.h.

+  * Dynamically linked clients now made with -l, so as to avoid rpath.
+  * Do not use $^ in make rules (should help with non-GNU make).

 
  --
 
 
  --
 

diff --git a/client/Makefile.in b/client/Makefile.in
index d55057e1513a234d4f3c8224a5070cf63a2735cd..276bc5ea7c56c89efd67ae880a28574e58c7afc2 100644 (file)
--- a/client/Makefile.in
+++ b/client/Makefile.in
@@ -34,6 +34,10 @@ DIRCFLAGS=   -I$(srcdir)/../src
 
 ADH_OBJS=      adh-main.o adh-opts.o adh-query.o
 
 
 ADH_OBJS=      adh-main.o adh-opts.o adh-query.o
 

+STATIC_LIB=    $(srcdir)/../src/libadns.a
+DYNAMIC_DEP=   $(srcdir)/../dynamic/$(SHLIBFILE)
+DYNAMIC_LINK=  -L$(srcdir)/../dynamic -ladns
+

 all:           $(TARGETS)
 
 install:       $(TARG_INSTALL)
 all:           $(TARGETS)
 
 install:       $(TARG_INSTALL)


@@ -45,14 +49,14 @@ uninstall:
 
 $(ADH_OBJS):   adnshost.h
 
 
 $(ADH_OBJS):   adnshost.h
 

-adnshost:      $(ADH_OBJS) $(srcdir)/../dynamic/$(SHLIBFILE)
-               $(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS)
+adnshost:      $(ADH_OBJS) $(DYNAMIC_DEP)
+               $(CC) $(LDFLAGS) $(ADH_OBJS) $(DYNAMIC_LINK) -o $@ $(LDLIBS)

 
 

-adnshost_s:    $(ADH_OBJS) $(srcdir)/../src/libadns.a
-               $(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS)
+adnshost_s:    $(ADH_OBJS) $(STATIC_LIB)
+               $(CC) $(LDFLAGS) $(ADH_OBJS) $(STATIC_LIB) -o $@ $(LDLIBS)

 
 

-%:             %.o $(srcdir)/../dynamic/$(SHLIBFILE)
-               $(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS)
+%:             %.o $(DYNAMIC_DEP)
+               $(CC) $(LDFLAGS) $< $(DYNAMIC_LINK) -o $@ $(LDLIBS)

 
 

-%_s:           %.o $(srcdir)/../src/libadns.a
-               $(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS)
+%_s:           %.o $(STATIC_LIB)
+               $(CC) $(LDFLAGS) $< -o $@ $(LDLIBS)

diff --git a/configure b/configure
index c985c5a6f9661ba2869c92b6860a82b148848c6e..07699c04528f3d37b2335f67a24a52429daf11d9 100755 (executable)
--- a/configure
+++ b/configure
@@ -1396,12 +1396,16 @@ fi
 
 
 
 
 
 

+
+

 SHLIBCC='$(CC) $(CFLAGS) -fpic'
 MKSHLIB_1='$(CC) $(LDFLAGS) -shared -Wxl,soname=$(SONAME) -o'
 MKSHLIB_2=''
 MKSHLIB_3='-lc'
 SHLIBCC='$(CC) $(CFLAGS) -fpic'
 MKSHLIB_1='$(CC) $(LDFLAGS) -shared -Wxl,soname=$(SONAME) -o'
 MKSHLIB_2=''
 MKSHLIB_3='-lc'

-SHLIBFILE='libadns.so.$(MAJOR).$(MINOR)'
-SHLIBSONAME='libadns.so.$(MAJOR)'
+
+SHLIBFORLINK='libadns.so'
+SHLIBSONAME='$(SHLIBFORLINK).$(MAJOR)'
+SHLIBFILE='$(SHLIBSONAME).$(MINOR)'

 
 trap '' 1 2 15
 cat > confcache <<\EOF
 
 trap '' 1 2 15
 cat > confcache <<\EOF


@@ -1543,6 +1547,7 @@ s%@SHLIBCC@%$SHLIBCC%g
 s%@MKSHLIB_1@%$MKSHLIB_1%g
 s%@MKSHLIB_2@%$MKSHLIB_2%g
 s%@MKSHLIB_3@%$MKSHLIB_3%g
 s%@MKSHLIB_1@%$MKSHLIB_1%g
 s%@MKSHLIB_2@%$MKSHLIB_2%g
 s%@MKSHLIB_3@%$MKSHLIB_3%g

+s%@SHLIBFORLINK@%$SHLIBFORLINK%g

 s%@SHLIBFILE@%$SHLIBFILE%g
 s%@SHLIBSONAME@%$SHLIBSONAME%g
 
 s%@SHLIBFILE@%$SHLIBFILE%g
 s%@SHLIBSONAME@%$SHLIBSONAME%g
 

diff --git a/configure.in b/configure.in
index c6e4a396b9db112f0ecd3a9b5cb256f3e9805ada..671f26e3c95d423690b7f9aefea64b19df53e315 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -72,6 +72,8 @@ AC_SUBST(SHLIBCC)
 AC_SUBST(MKSHLIB_1)
 AC_SUBST(MKSHLIB_2)
 AC_SUBST(MKSHLIB_3)
 AC_SUBST(MKSHLIB_1)
 AC_SUBST(MKSHLIB_2)
 AC_SUBST(MKSHLIB_3)

+
+AC_SUBST(SHLIBFORLINK)

 AC_SUBST(SHLIBFILE)
 AC_SUBST(SHLIBSONAME)
 
 AC_SUBST(SHLIBFILE)
 AC_SUBST(SHLIBSONAME)
 


@@ -79,8 +81,10 @@ SHLIBCC='$(CC) $(CFLAGS) -fpic'
 MKSHLIB_1='$(CC) $(LDFLAGS) -shared -Wxl,soname=$(SONAME) -o'
 MKSHLIB_2=''
 MKSHLIB_3='-lc'
 MKSHLIB_1='$(CC) $(LDFLAGS) -shared -Wxl,soname=$(SONAME) -o'
 MKSHLIB_2=''
 MKSHLIB_3='-lc'

-SHLIBFILE='libadns.so.$(MAJOR).$(MINOR)'
-SHLIBSONAME='libadns.so.$(MAJOR)'
+
+SHLIBFORLINK='libadns.so'
+SHLIBSONAME='$(SHLIBFORLINK).$(MAJOR)'
+SHLIBFILE='$(SHLIBSONAME).$(MINOR)'

 
 AC_OUTPUT(
        settings.make Makefile
 
 AC_OUTPUT(
        settings.make Makefile

diff --git a/dynamic/Makefile.in b/dynamic/Makefile.in
index 5ed63884d0633995e1750bd7dc4392bd4c1d487d..87b95d73d71c51473d17bed522e881961fbb2e4e 100644 (file)
--- a/dynamic/Makefile.in
+++ b/dynamic/Makefile.in
@@ -24,7 +24,7 @@
 srcdir=                @srcdir@
 VPATH=         @srcdir@
 
 srcdir=                @srcdir@
 VPATH=         @srcdir@
 

-TARGETS=       $(SHLIBFILE)
+TARGETS=       $(SHLIBFILE) $(SHLIBSONAME) $(SHLIBFORLINK)

 include                $(srcdir)/../settings.make
 include                $(srcdir)/../src/adns.make
 
 include                $(srcdir)/../settings.make
 include                $(srcdir)/../src/adns.make
 


@@ -36,6 +36,12 @@ install:
 uninstall:
                rm -f $(lib_dir)/$(SHLIBFILE)
 
 uninstall:
                rm -f $(lib_dir)/$(SHLIBFILE)
 

+$(SHLIBFORLINK):
+               ln -s $(SHLIBSONAME) $(SHLIBFORLINK)
+
+$(SHLIBSONAME):
+               ln -s $(SHLIBFILE) $(SHLIBSONAME)
+

 $(SHLIBFILE):  $(ALLOBJS)
                rm -f $@
                $(MKSHLIB_1) $@ $(MKSHLIB_2) $(ALLOBJS) $(LDLIBS) $(MKSHLIB_3)
 $(SHLIBFILE):  $(ALLOBJS)
                rm -f $@
                $(MKSHLIB_1) $@ $(MKSHLIB_2) $(ALLOBJS) $(LDLIBS) $(MKSHLIB_3)

diff --git a/settings.make.in b/settings.make.in
index 0967cd57f1c77e5d0d26a5de67834f0ece063f0e..95932cb1e5e6418be884beb624f8b9c34cc8af35 100644 (file)
--- a/settings.make.in
+++ b/settings.make.in
@@ -26,6 +26,7 @@ MAJOR=                0
 MINOR=         1
 SHLIBFILE=     @SHLIBFILE@
 SHLIBSONAME=   @SHLIBSONAME@
 MINOR=         1
 SHLIBFILE=     @SHLIBFILE@
 SHLIBSONAME=   @SHLIBSONAME@

+SHLIBFORLINK=  @SHLIBFORLINK@

 
 CC=            @CC@
 CFLAGS=                $(AUTOCFLAGS) $(WARNS) $(WERROR) $(DIRCFLAGS) $(XCFLAGS)
 
 CC=            @CC@
 CFLAGS=                $(AUTOCFLAGS) $(WARNS) $(WERROR) $(DIRCFLAGS) $(XCFLAGS)