Fixed merge problems

This commit is contained in:
ptools
2004-06-15 07:32:36 +00:00
parent 2c3b0bab9f
commit cb6beb9759
144 changed files with 2372 additions and 2383 deletions
+2 -1
View File
@@ -38,7 +38,7 @@ include $(TOPDIR)/include/builddefs
endif
TESTS = $(shell sed -n -e '/^[0-9][0-9][0-9]*/s/ .*//p' group)
CONFIGURE = configure include/builddefs
CONFIGURE = configure include/builddefs include/config.h
LSRCFILES = configure configure.in aclocal.m4 README VERSION
LDIRT = config.log .dep config.status config.cache confdefs.h conftest* \
check.log check.time
@@ -59,6 +59,7 @@ clean: # if configure hasn't run, nothing to clean
endif
$(CONFIGURE):
autoheader
autoconf
./configure