| [AD] Build asmdef in the right directory |
[ Thread Index |
Date Index
| More lists.liballeg.org/allegro-developers Archives
]
It just occured to me that the helper program asmdef is built in the source
directory (src/i386) on Unix. Not very pretty and the other ports build it
in the object directory.
Fixed thusly, applied to mainline and 4.0 branch.
--
Eric Botcazou
--- /home/eric/cvs/allegro/makefile.in Tue May 11 18:03:54 2004
+++ allegro/makefile.in Sat May 15 12:07:54 2004
@@ -222,8 +222,11 @@
else
-$(obj_unix_asmdef_inc): src/i386/asmdef$(EXE)
- src/i386/asmdef$(EXE) $(obj_unix_asmdef_inc)
+$(obj_unix_asmdef_inc): $(OBJDIR)/asmdef$(EXE)
+ $(OBJDIR)/asmdef$(EXE) $(obj_unix_asmdef_inc)
+
+$(OBJDIR)/asmdef$(EXE): $(srcdir)/src/i386/asmdef.c $(ALLEGRO_ASMCAPA_HEADER) $(allegro_h)
+ $(COMPILE_PROGRAM) $(srcdir)/src/i386/asmdef.c -o $(OBJDIR)/asmdef$(EXE)
endif
@@ -672,8 +675,6 @@
$(SHELL) -c 'cd $(srcdir) && misc/depdlib.sh tools/datedit.c' >>makefile.dep
@echo "Generating dependencies for datafile programs"
$(SHELL) -c 'cd $(srcdir) && misc/depdexe.sh $(ALLEGRO_DATAFILE_EXE_SOURCES)' >>makefile.dep
- @echo "Generating dependencies for programs without libraries"
- $(SHELL) -c 'cd $(srcdir) && misc/depnexe.sh $(ALLEGRO_NOLIB_EXE_SOURCES)' >>makefile.dep
@echo "Generating dependencies for makedoc"
$(SHELL) -c 'cd $(srcdir) && misc/depmexe.sh docs/makedoc $(ALLEGRO_MAKEDOC_SOURCES)' >>makefile.dep
@echo "Dependency generation completed!"
--- /home/eric/cvs/allegro/makefile.lst Sun Apr 25 09:09:09 2004
+++ allegro/makefile.lst Sat May 15 12:14:10 2004
@@ -567,15 +567,12 @@
examples/exxfade \
examples/exzbuf
-ALLEGRO_NOLIB_EXE_SOURCES = \
- src/i386/asmdef.c
-
OBJ_CLEAN_FILES = \
obj/*/*.o obj/*/*/*.o obj/*/*/*/*.o obj/*/*.obj obj/*/*/*.obj
OTHER_CLEAN_FILES = \
obj/*/*.h obj/*/*.s obj/*/*.exe obj/*/*/*.lst obj/*/*/*.asm \
- obj/*/*.res obj/*/asmdef obj/*/*.inc src/i386/asmdef \
+ obj/*/*.res obj/*/asmdef obj/*/*.inc \
lib/*/*.a lib/unix/*.so* lib/unix/sta* \
lib/*/*.lib lib/*/*.exp lib/*/*.dll \
lib/*/*.pdb lib/*/*.ilk lib/*/*.map *.pdb */*.pdb \