Use new LIBRADIUS definition

	Renamed libradius to libfreeradius-radius, to avoid conflicts

diff --git a/src/lib/Makefile b/src/lib/Makefile
index 9df75a7..afe618a 100644 (file)
--- a/src/lib/Makefile
+++ b/src/lib/Makefile
@@ -30,7 +30,7 @@ else
 LINK_MODE      = -static
 endif
 
-TARGET         = $(LIBPREFIX)radius
+TARGET         = $(LIBPREFIX)freeradius-radius
 
 # Define new rule for libtool objects
 %.lo : %.c

diff --git a/src/main/Makefile.in b/src/main/Makefile.in
index 8466991..12918b3 100644 (file)
--- a/src/main/Makefile.in
+++ b/src/main/Makefile.in
@@ -62,10 +62,10 @@ all: $(BINARIES)
 
 $(SERVER_OBJS): $(INCLUDES)
 
-radiusd: $(SERVER_OBJS) $(MODULE_OBJS) ../lib/libradius.la
+radiusd: $(SERVER_OBJS) $(MODULE_OBJS) $(LIBRADIUS)
        $(LIBTOOL) --mode=link $(CC) -export-dynamic -dlopen self \
                $(LDFLAGS) $(LINK_MODE) -o $@ $(SERVER_OBJS)      \
-               $(MODULE_LIBS) ../lib/libradius.la $(LIBS) $(SNMP_LIBS) \
+               $(MODULE_LIBS) $(LIBRADIUS) $(LIBS) $(SNMP_LIBS) \
                $(LCRYPT) $(PTHREADLIB) $(LIBLTDL) $(OPENSSL_LIBS)
 
 radiusd.lo: radiusd.c  ../include/modules.h ../include/modcall.h ../include/modpriv.h
@@ -105,20 +105,20 @@ session.lo: session.c ../include/modules.h
 radclient.lo: radclient.c $(INCLUDES)
        $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c radclient.c
 
-radclient: radclient.lo ../lib/libradius.la
-       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LINK_MODE) -o radclient radclient.lo ../lib/libradius.la $(LIBS)
+radclient: radclient.lo $(LIBRADIUS)
+       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LINK_MODE) -o radclient radclient.lo $(LIBRADIUS) $(LIBS)
 
 radsniff.lo: radsniff.c $(INCLUDES) ../include/radsniff.h
        $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c radsniff.c
 
-radsniff: radsniff.lo ../lib/libradius.la
-       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LINK_MODE) -o radsniff radsniff.lo ../lib/libradius.la $(LIBS) $(PCAP_LIBS)
+radsniff: radsniff.lo $(LIBRADIUS)
+       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LINK_MODE) -o radsniff radsniff.lo $(LIBRADIUS) $(LIBS) $(PCAP_LIBS)
 
 radwho.lo: radwho.c $(INCLUDES)
        $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c radwho.c
 
-radwho: radwho.lo util.lo log.lo conffile.lo ../lib/libradius.la
-       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LINK_MODE) -o radwho radwho.lo util.lo log.lo conffile.lo ../lib/libradius.la $(LIBS)
+radwho: radwho.lo util.lo log.lo conffile.lo $(LIBRADIUS)
+       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LINK_MODE) -o radwho radwho.lo util.lo log.lo conffile.lo $(LIBRADIUS) $(LIBS)
 
 
 clean:

diff --git a/src/modules/rlm_dbm/Makefile.in b/src/modules/rlm_dbm/Makefile.in
index 848f384..3e901fd 100644 (file)
--- a/src/modules/rlm_dbm/Makefile.in
+++ b/src/modules/rlm_dbm/Makefile.in
@@ -12,11 +12,11 @@ RLM_INSTALL = @dbm_install@
 
 include ../rules.mak
 
-rlm_dbm_parser: rlm_dbm_parser.lo ../../lib/libradius.la
+rlm_dbm_parser: rlm_dbm_parser.lo $(LIBRADIUS)
        $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(RLM_LDFLAGS) \
                -o $@ $^ $(RLM_LIBS) $(LIBS)
 
-rlm_dbm_cat: rlm_dbm_cat.lo ../../lib/libradius.la
+rlm_dbm_cat: rlm_dbm_cat.lo $(LIBRADIUS)
        $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(RLM_LDFLAGS) \
                -o $@ $^ $(RLM_LIBS) $(LIBS)
 

diff --git a/src/modules/rlm_ippool/Makefile.in b/src/modules/rlm_ippool/Makefile.in
index e055aa8..a9f9fb2 100644 (file)
--- a/src/modules/rlm_ippool/Makefile.in
+++ b/src/modules/rlm_ippool/Makefile.in
@@ -14,7 +14,7 @@ include ../rules.mak
 
 $(LT_OBJS): $(HEADERS)
 
-rlm_ippool_tool: rlm_ippool_tool.lo ../../lib/libradius.la
+rlm_ippool_tool: rlm_ippool_tool.lo $(LIBRADIUS)
        $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(RLM_LDFLAGS) \
                -o $@ $^ $(RLM_LIBS) $(LIBS)
 

diff --git a/src/modules/rlm_mschap/Makefile b/src/modules/rlm_mschap/Makefile
index 8933e81..f249dfc 100644 (file)
--- a/src/modules/rlm_mschap/Makefile
+++ b/src/modules/rlm_mschap/Makefile
@@ -18,7 +18,7 @@ include ../rules.mak
 
 $(LT_OBJS): $(HEADERS)
 
-smbencrypt: smbencrypt.lo smbdes.lo ../../lib/libradius.la
+smbencrypt: smbencrypt.lo smbdes.lo $(LIBRADIUS)
        $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(RLM_LDFLAGS) \
                -o $@ $^ $(RLM_LIBS) $(LIBS)
 

diff --git a/src/modules/rules.mak b/src/modules/rules.mak
index 1c113b7..f4f0ede 100644 (file)
--- a/src/modules/rules.mak
+++ b/src/modules/rules.mak
@@ -108,14 +108,13 @@ endif
 
 build-module: $(TARGET).la $(RLM_UTILS)
        @[ "x$(RLM_SUBDIRS)" = "x" ] || $(MAKE) $(MFLAGS) WHAT_TO_MAKE=all common
-       @[ -d .libs ] && cp .libs/* $(top_builddir)/src/modules/lib
+       @[ -d .libs ] && cp .libs/* $(top_builddir)/src/modules/lib/.libs
        @cp $< $(top_builddir)/src/modules/lib
 
 $(TARGET).la: $(LT_OBJS)
        $(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \
        -module $(LINK_MODE) $(LDFLAGS) $(RLM_LDFLAGS) -o $@     \
-       -rpath $(libdir) $^ $(top_builddir)/src/lib/libradius.la \
-       $(RLM_LIBS) $(LIBS)
+       -rpath $(libdir) $^ $(LIBRADIUS) $(RLM_LIBS) $(LIBS)
 
 #######################################################################
 #