| Re: Re: [AD] Deprecated functions and fix.sh |
[ Thread Index |
Date Index
| More lists.liballeg.org/allegro-developers Archives
]
> I guess I had a library missing or something, but when it came time to
> compile some of the tools, i got error messages about xf2pcx.
Right, the compilation aborts because of a missing library. The failure
doesn't occur for the 4.0.x series because there are no such tools. Thanks
for reporting the problem!
Fixed thusly, tested on Linux and Solaris 8, applied to mainline and
(partially) to branch.
--
Eric Botcazou
--- /home/eric/cvs/allegro/makefile.in Sat Jun 28 13:25:34 2003
+++ allegro/makefile.in Sun Jun 29 01:47:24 2003
@@ -593,7 +593,8 @@
$(SHELL) -c 'cd $(srcdir) && misc/depmod.sh artsdigi "\`artsc-config --libs\`" $(ALLEGRO_MODULE_ARTS_FILES)' >>makefile.dep
$(SHELL) -c 'cd $(srcdir) && misc/depmod.sh sgialdigi -laudio $(ALLEGRO_MODULE_SGIAL_FILES)' >>makefile.dep
@echo "Generating dependencies for simple programs"
- $(SHELL) -c 'cd $(srcdir) && misc/deplexe.sh $(ALLEGRO_LIB_EXE_SOURCES) $(@ALLEGRO_MAYBE_LIB_X_EXE_SOURCES@) $(ALLEGRO_EXAMPLE_FILES)' >>makefile.dep
+ $(SHELL) -c 'cd $(srcdir) && misc/deplexe.sh -- $(ALLEGRO_LIB_EXE_SOURCES) $(ALLEGRO_EXAMPLE_FILES)' >>makefile.dep
+ $(SHELL) -c 'cd $(srcdir) && misc/deplexe.sh -lX11 $(@ALLEGRO_MAYBE_LIB_X_EXE_SOURCES@) ' >>makefile.dep
@echo "Generating dependencies for datafile plugins"
$(SHELL) -c 'cd $(srcdir) && misc/depdlib.sh tools/datedit.c' >>makefile.dep
@echo "Generating dependencies for datafile programs"
--- /home/eric/cvs/allegro/misc/deplexe.sh Sun May 6 23:37:22 2001
+++ allegro/misc/deplexe.sh Sun Jun 29 01:41:14 2003
@@ -1,8 +1,13 @@
#! /bin/sh
+# Usage: deplexe.sh libraries sources ...
+
# Generate dependencies and rules for building simple programs
# from one source file and library.
+libs=$1
+shift
+
missing=
symbols=
for file in .. $*; do
@@ -55,7 +60,11 @@
# Program.
echo "$dir/$name\$(EXE): \$(OBJDIR)/$name\$(OBJ) \$(LIBALLEG)"
- echo " \$(LINK) -o $dir/$name\$(EXE) \$(OBJDIR)/$name\$(OBJ) \$(LINK_LIBALLEG)"
+ if test "$libs" = "--"; then
+ echo " \$(LINK) -o $dir/$name\$(EXE) \$(OBJDIR)/$name\$(OBJ) \$(LINK_LIBALLEG)"
+ else
+ echo " \$(LINK) -o $dir/$name\$(EXE) \$(OBJDIR)/$name\$(OBJ) \$(LINK_LIBALLEG) $libs"
+ fi
echo ""
# Object file.