Parcourir la source

Hookup bdlib using new autotools system

Bryan Drewery il y a 11 ans
Parent
commit
b9403ed826
2 fichiers modifiés avec 15 ajouts et 14 suppressions
  1. 5 4
      lib/Makefile.in
  2. 10 10
      src/Makefile.in

+ 5 - 4
lib/Makefile.in

@@ -31,11 +31,12 @@ debug: general notice_debug build.debug
 
 general:
 
-build:
-	+@cd bdlib && $(MAKE) bdlib
+bdlib/libbdlib.a:
+	+@cd bdlib && $(MAKE)
 
-build.debug:
-	+@cd bdlib && $(MAKE) debug
+build: bdlib/libbdlib.a
+
+build.debug: bdlib/libbdlib.a
 
 buildcheck: build
 

+ 10 - 10
src/Makefile.in

@@ -74,24 +74,24 @@ blah:
 	@echo "Use the build script."
 	@echo ""
 
-makeres: makeres.c ../lib/bdlib/src/libbdlib.a
+makeres: makeres.c ../lib/bdlib/libbdlib.a
 	@echo -e "Compiling: \033[1mmakeres\033[0m"
-	@$(CXX) $(CXXFLAGS) -I$(top_srcdir)/src -I$(top_srcdir)/pack $(CPPFLAGS) $< ../lib/bdlib/src/libbdlib.a -o $@
+	@$(CXX) $(CXXFLAGS) -I$(top_srcdir)/src -I$(top_srcdir)/pack $(CPPFLAGS) $< ../lib/bdlib/libbdlib.a -o $@
 	@$(STRIP) $@@EXEEXT@
 
-makeset: makeset.c ../lib/bdlib/src/libbdlib.a
+makeset: makeset.c ../lib/bdlib/libbdlib.a
 	@echo -e "Compiling: \033[1mmakeset\033[0m"
-	@$(CXX) $(CXXFLAGS) -I$(top_srcdir)/src -I$(top_srcdir)/pack $(CPPFLAGS) $< ../lib/bdlib/src/libbdlib.a -o $@
+	@$(CXX) $(CXXFLAGS) -I$(top_srcdir)/src -I$(top_srcdir)/pack $(CPPFLAGS) $< ../lib/bdlib/libbdlib.a -o $@
 	@$(STRIP) $@@EXEEXT@
 
-makehelp: makehelp.c ../lib/bdlib/src/libbdlib.a
+makehelp: makehelp.c ../lib/bdlib/libbdlib.a
 	@echo -e "Compiling: \033[1mmakehelp\033[0m"
-	@$(CXX) $(CXXFLAGS) -I$(top_srcdir)/src -I$(top_srcdir)/pack $(CPPFLAGS) $< ../lib/bdlib/src/libbdlib.a -o $@
+	@$(CXX) $(CXXFLAGS) -I$(top_srcdir)/src -I$(top_srcdir)/pack $(CPPFLAGS) $< ../lib/bdlib/libbdlib.a -o $@
 	@$(STRIP) $@@EXEEXT@
 
-sorthelp: sorthelp.c ../lib/bdlib/src/libbdlib.a
+sorthelp: sorthelp.c ../lib/bdlib/libbdlib.a
 	@echo -e "Compiling: \033[1msorthelp\033[0m"
-	@$(CXX) $(CXXFLAGS) -I$(top_srcdir)/src -I$(top_srcdir)/pack $(CPPFLAGS) $< ../lib/bdlib/src/libbdlib.a -o $@
+	@$(CXX) $(CXXFLAGS) -I$(top_srcdir)/src -I$(top_srcdir)/pack $(CPPFLAGS) $< ../lib/bdlib/libbdlib.a -o $@
 	@$(STRIP) $@@EXEEXT@
 
 stringfix: stringfix.c common.h config.h eggdrop.h
@@ -100,12 +100,12 @@ stringfix: stringfix.c common.h config.h eggdrop.h
 	@$(STRIP) $@@EXEEXT@
 
 #../$(EGGEXEC): build_msg $(OBJS) mycrypto compatability
-../$(EGGEXEC): build_msg $(OBJS) mycrypto compatability ../lib/bdlib/src/libbdlib.a
+../$(EGGEXEC): build_msg $(OBJS) mycrypto compatability ../lib/bdlib/libbdlib.a
 	@echo "[*] Linking"
 	@echo ""
 	@echo "Linking wraith... $(EGGBUILD)"
 	@echo ""
-	$(LD) -o ../$(EGGEXEC) $(OBJS) $(MODOBJS) compat/*.o crypto/*.o ../lib/bdlib/src/libbdlib.a $(LIBS)
+	$(LD) -o ../$(EGGEXEC) $(OBJS) $(MODOBJS) compat/*.o crypto/*.o ../lib/bdlib/libbdlib.a $(LIBS)
 #	$(LD) -o ../$(EGGEXEC) $(OBJS) $(MODOBJS) $(LIBS) compat/*.o crypto/*.o
 	@$(STRIP) ../$(EGGEXEC)
 	@$(OBJCOPY) ../$(EGGEXEC)