* Complete move of bdlib to lib/ (Leave disabled as 1.2.x doesnt use it)

svn: 3743

Makefile.in

@@ -81,9 +81,9 @@ cleanutils:
 clean:  cleanutils
 	+@cd src && $(MAKE) clean
 	+@cd src/compat && $(MAKE) clean
-#	+@cd src/bdlib && $(MAKE) clean
 	+@cd src/crypto && $(MAKE) clean
 	+@cd src/mod && $(MAKE) distclean
+	-+@cd lib && $(MAKE) clean
 	@rm -f $(BINEXEC) stamp.* *~ src/*~ configure.temp .mangled
 	@rm -f src/help.h src/response.h src/responses.h utctime@EXEEXT@ ts@EXEEXT@
 
@@ -92,7 +92,7 @@ distclean: clean
 	@rm -f config.cache config.log config.status config.h 
 	@rm -rf *-$(VERSION)/ autom4te.cache/ autoscan.log configure.scan
 	@rm -rf src/.deps/ src/compat/.deps/ src/strucutres/.deps/ src/mod/*.mod/.deps/ src/crypto/.deps
-#	+@cd src/bdlib && $(MAKE) distclean
+	-+@cd lib && $(MAKE) distclean
 
 
 distrib: clean
@@ -198,6 +198,7 @@ wraith:	general
 	@echo "Making binary"
 	@echo ""
 	@echo ""
+	+@cd lib && $(MAKE)
 	+@cd src/mod && $(MAKE_BIN) static
 	+@cd src && $(MAKE_BIN) $(BINEXEC)
 	@echo ""
@@ -209,6 +210,7 @@ debug:  general
 	@echo "Making debug binary"
 	@echo ""
 	@echo ""
+	+@cd lib && $(MAKE) debug
 	+@cd src/mod && $(MAKE_DEBUG) static
 	+@cd src && $(MAKE_DEBUG) $(BINEXEC)
 	@echo ""

autotools/configure.ac

@@ -158,7 +158,7 @@ EGG_SUBST_VERSION
 EGG_SUBST_MOD_UPDIR
 DO_DEPS
 
-AC_CONFIG_FILES([Makefile src/Makefile src/compat/Makefile src/crypto/Makefile src/mod/Makefile src/buildinfo.h])
+AC_CONFIG_FILES([Makefile lib/Makefile src/Makefile src/compat/Makefile src/crypto/Makefile src/mod/Makefile src/buildinfo.h])
 AC_OUTPUT
 
 AH_TEMPLATE(HAVE_ST_MTIM, [Define to 1 if your struct stat has an st_mtim member])
@@ -203,4 +203,4 @@ AH_BOTTOM([/*
 #echo ""
 #echo ""
 #echo "------------ Configuring BDLIB ------------"
-#cd src/bdlib && ./configure
+#cd lib/bdlib && ./configure

configure

@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 3735 .
+# From configure.ac Revision: 3736 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61.
 #
@@ -11920,7 +11920,7 @@ echo X"$mf" |
 done
 
 
-ac_config_files="$ac_config_files Makefile src/Makefile src/compat/Makefile src/crypto/Makefile src/mod/Makefile src/buildinfo.h"
+ac_config_files="$ac_config_files Makefile lib/Makefile src/Makefile src/compat/Makefile src/crypto/Makefile src/mod/Makefile src/buildinfo.h"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -12476,6 +12476,7 @@ do
   case $ac_config_target in
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+    "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "src/compat/Makefile") CONFIG_FILES="$CONFIG_FILES src/compat/Makefile" ;;
     "src/crypto/Makefile") CONFIG_FILES="$CONFIG_FILES src/crypto/Makefile" ;;
@@ -13052,4 +13053,4 @@ fi
 #echo ""
 #echo ""
 #echo "------------ Configuring BDLIB ------------"
-#cd src/bdlib && ./configure
+#cd lib/bdlib && ./configure

lib/Makefile.in

@@ -0,0 +1,41 @@
+
+SHELL = @SHELL@
+top_srcdir = @top_srcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
+
+@SET_MAKE@
+
+#include $(top_srcdir)/build/build.mk
+
+.PHONY: default clean distclean normal debug general buildcheck notice notice_debug build units
+
+default: normal
+
+clean:
+#	-+@cd bdlib && $(MAKE) clean
+	@rm -f *.a
+
+distclean: clean
+#	-+@cd bdlib && $(MAKE) distclean
+
+notice:
+	@echo "[*] Making libraries"
+
+notice_debug:
+	@echo "[*] Making libraries (debug)"
+
+normal: general notice build
+
+debug: general notice_debug build
+
+general:
+
+build:
+#	+@cd bdlib && $(MAKE) bdlib
+
+buildcheck: build
+
+units:
+#	+@cd bdlib/tests && $(MAKE) units
+

src/Makefile.in

@@ -8,7 +8,7 @@ depcomp = /bin/sh $(top_srcdir)/autotools/depcomp
 
 @SET_MAKE@
 
-CXXFLAGS = @CXXFLAGS@ -I.. -I$(top_srcdir) -I$(top_srcdir)/pack @DEFS@ $(CFLGS) '-DREVISION=$(REVISION)' -DBUILDTS=$(BUILDTS)
+CXXFLAGS = @CXXFLAGS@ -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/pack @DEFS@ $(CFLGS) '-DREVISION=$(REVISION)' -DBUILDTS=$(BUILDTS)
 CPPFLAGS = @CPPFLAGS@
 
 OBJCOPY = @OBJCOPY@
@@ -94,12 +94,13 @@ stringfix: stringfix.c common.h ../config.h eggdrop.h
 	@$(CXX) $(CXXFLAGS) -I$(top_srcdir) -I$(top_srcdir)/pack $(CPPFLAGS) stringfix.c -o stringfix
 	@$(STRIP) stringfix@EXEEXT@
 
-../$(EGGEXEC): build_msg $(OBJS) mycrypto compatability
+#../$(EGGEXEC): build_msg $(OBJS) mycrypto compatability ../lib/bdlib/src/libbdlib.a
+../$(EGGEXEC): build_msg $(OBJS) mycrypto compatability 
 	@echo "[*] Linking"
 	@echo ""
 	@echo "Linking wraith... $(EGGBUILD)"
 	@echo ""
-#	$(LD) -o ../$(EGGEXEC) $(OBJS) $(MODOBJS) $(LIBS) compat/*.o crypto/*.o bdlib/src/libbdlib.a
+#	$(LD) -o ../$(EGGEXEC) $(OBJS) $(MODOBJS) $(LIBS) compat/*.o crypto/*.o ../lib/bdlib/src/libbdlib.a
 	$(LD) -o ../$(EGGEXEC) $(OBJS) $(MODOBJS) $(LIBS) compat/*.o crypto/*.o
 	@$(STRIP) ../$(EGGEXEC)
 	@$(OBJCOPY) ../$(EGGEXEC)
@@ -118,10 +119,6 @@ compatability:
 	@echo "[*] Compiling compatability components"
 	+@cd compat && $(MAKE_GENERIC) compat
 
-mybdlib:
-	@echo "[*] Compiling BDLIB components"
-	+@cd bdlib && $(MAKE_GENERIC)
-
 mycrypto:
 	@echo "[*] Compiling crypto"
 	+@cd crypto && $(MAKE_GENERIC) crypto

src/mod/Makefile.in

@@ -12,7 +12,7 @@ STRIP = @STRIP@
 CXXFLAGS = @CXXFLAGS@ -I../.. -I$(top_srcdir) @DEFS@ $(CFLGS)
 CPPFLAGS = @CPPFLAGS@
 MOD_CXXFLAGS = @CXXFLAGS@ -I. -I../../.. -I$(MOD_UPDIR)$(top_srcdir) \
-  -I$(MOD_UPDIR)$(top_srcdir)/src/mod -I$(top_srcdir)/pack @DEFS@ $(CFLGS)
+  -I$(MOD_UPDIR)$(top_srcdir)/src/mod -I$(top_srcdir)/lib -I$(top_srcdir)/pack @DEFS@ $(CFLGS)
 MOD_CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@