X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=src%2Flib%2FMakefile;h=25572015cd7fb5997823c899bef23109ee0e6891;hb=df38586ae7d06ffc50a7b6d115b95797f61fca16;hp=0afdc167c3aa4cd1a9ea9a549c321d2f7ce6eccc;hpb=0fe78ce2f659dd20e837ffb65d6b998edeac2019;p=freeradius.git

diff --git a/src/lib/Makefile b/src/lib/Makefile
index 0afdc16..2557201 100644
--- a/src/lib/Makefile
+++ b/src/lib/Makefile
@@ -1,67 +1,60 @@
 #
-# $Id$
+# Makefile
+#
+# Version:      $Id$
 #
 
 include ../../Make.inc
 
-SRCS		= dict.c print.c radius.c valuepair.c token.c misc.c \
-		log.c filters.c missing.c md4.c md5.c sha1.c \
-		hmac.c hmacsha1.c snprintf.c isaac.c crypt.c \
-		udpfromto.c rbtree.c hash.c
+SRCS		= dict.c filters.c hash.c hmac.c hmacsha1.c isaac.c log.c \
+		  misc.c missing.c md4.c md5.c print.c radius.c rbtree.c \
+		  sha1.c snprintf.c strlcat.c strlcpy.c token.c udpfromto.c \
+		  valuepair.c fifo.c packet.c event.c getaddrinfo.c vqp.c \
+		  heap.c dhcp.c tcp.c
+
+LT_OBJS		= $(SRCS:.c=.lo)
 
 INCLUDES	= ../include/radius.h ../include/libradius.h \
-		  ../include/missing.h ../include/autoconf.h
+		  ../include/missing.h ../include/autoconf.h \
+		  ../include/ident.h
 
-CFLAGS		+= -D_LIBRADIUS -I../include
+CFLAGS		+= -D_LIBRADIUS -I$(top_builddir)/src
 
 # if you have problems with things that need SHA1-HMAC, this will
 # dump the key and the input to the hash so you can compare to what
 # the other end is doing.
-CFLAGS += -DHMAC_SHA1_DATA_PROBLEMS
-
-all:	static dynamic
-
-TARGET=$(LIBPREFIX)radius
+#CFLAGS += -DHMAC_SHA1_DATA_PROBLEMS
 
-STATIC_OBJS	= $(SRCS:.c=.o)
-DYNAMIC_OBJS	= $(SRCS:.c=.lo)
+ifeq ($(USE_SHARED_LIBS),yes)
+LINK_MODE	= -export-dynamic
+else
+LINK_MODE	= -static
+endif
 
-$(STATIC_OBJS):  $(INCLUDES)
-$(DYNAMIC_OBJS): $(INCLUDES)
-
-#######################################################################
-#
-# define new rules
-#
-#######################################################################
-%.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
+TARGET		= $(LIBPREFIX)freeradius-radius
 
+# Define new rule for libtool objects
 %.lo : %.c
 	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $<
 
+.PHONY: all clean install reconfig
+all: $(TARGET).la
 
-$(TARGET).a: $(STATIC_OBJS)
-	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -static -o $@ $^ $(LCRYPT)
-
-ifneq ($(USE_SHARED_LIBS),yes)
-LINK_MODE=-static
-endif
-
-$(TARGET).la: $(DYNAMIC_OBJS)
+$(TARGET).la: $(LT_OBJS)
 	$(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \
-	$(LDFLAGS) $(LINK_MODE) -o $@ -rpath $(libdir) $^ $(LCRYPT)
-
-static: $(TARGET).a
+	$(LDFLAGS) $(LINK_MODE) -o $@ -rpath $(libdir) $^
 
-dynamic: $(TARGET).la
+$(LT_OBJS): $(INCLUDES)
 
 clean:
-	rm -f *.o *.lo $(TARGET).a $(TARGET).la
+	rm -f *.o *.lo $(TARGET).la
 	rm -rf .libs
 
-install: static dynamic
-	$(LIBTOOL) --mode=install $(INSTALL) -c \
-		$(TARGET).la $(R)$(libdir)/$(TARGET).la;
+install: all
+	$(INSTALL) -d -m 755	$(R)$(libdir)
+	$(LIBTOOL) --mode=install $(INSTALL) -c $(TARGET).la \
+		$(R)$(libdir)/$(TARGET).la
 	rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la;
 	ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la
+
+reconfig: