Răsfoiți Sursa

* Disable bdlib now as 1.2.x does not even use it.

svn: 3736
Bryan Drewery 18 ani în urmă
părinte
comite
bd39e9a1d1
4 a modificat fișierele cu 15 adăugiri și 14 ștergeri
  1. 3 3
      Makefile.in
  2. 4 4
      autotools/configure.ac
  3. 5 5
      configure
  4. 3 2
      src/Makefile.in

+ 3 - 3
Makefile.in

@@ -81,18 +81,18 @@ cleanutils:
 clean:  cleanutils
 	+@cd src && $(MAKE) clean
 	+@cd src/compat && $(MAKE) clean
-	+@cd src/bdlib && $(MAKE) clean
+#	+@cd src/bdlib && $(MAKE) clean
 	+@cd src/crypto && $(MAKE) clean
 	+@cd src/mod && $(MAKE) distclean
 	@rm -f $(BINEXEC) stamp.* *~ src/*~ configure.temp .mangled
 	@rm -f src/help.h src/response.h src/responses.h utctime@EXEEXT@ ts@EXEEXT@
 
 distclean: clean
-	@rm -f Makefile src/Makefile src/compat/Makefile src/bdlib/Makefile src/mod/Makefile src/crypto/Makefile src/buildinfo.h
+	@rm -f Makefile src/Makefile src/compat/Makefile src/mod/Makefile src/crypto/Makefile src/buildinfo.h
 	@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 src/bdlib && $(MAKE) distclean
 
 
 distrib: clean

+ 4 - 4
autotools/configure.ac

@@ -200,7 +200,7 @@ AH_BOTTOM([/*
 #endif
 ])
 
-echo ""
-echo ""
-echo "------------ Configuring BDLIB ------------"
-cd src/bdlib && ./configure
+#echo ""
+#echo ""
+#echo "------------ Configuring BDLIB ------------"
+#cd src/bdlib && ./configure

+ 5 - 5
configure

@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 3400 .
+# From configure.ac Revision: 3735 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61.
 #
@@ -13049,7 +13049,7 @@ fi
 
 
 
-echo ""
-echo ""
-echo "------------ Configuring BDLIB ------------"
-cd src/bdlib && ./configure
+#echo ""
+#echo ""
+#echo "------------ Configuring BDLIB ------------"
+#cd src/bdlib && ./configure

+ 3 - 2
src/Makefile.in

@@ -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 mybdlib
+../$(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 bdlib/src/libbdlib.a
+	$(LD) -o ../$(EGGEXEC) $(OBJS) $(MODOBJS) $(LIBS) compat/*.o crypto/*.o
 	@$(STRIP) ../$(EGGEXEC)
 	@$(OBJCOPY) ../$(EGGEXEC)
 	@echo "Successful compile: $(EGGEXEC)"