From df49c60c9671e4a28e636964d744c1f59fb6cb68 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 12 Jun 2000 15:00:15 +0000 Subject: Merged from 4.5.0-beta3a --- make/leaf.cfg | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'make/leaf.cfg') diff --git a/make/leaf.cfg b/make/leaf.cfg index 88f708cac8..a4f29aa6ef 100644 --- a/make/leaf.cfg +++ b/make/leaf.cfg @@ -42,13 +42,14 @@ ifeq (${DEPEND},$(wildcard ${DEPEND})) include ${DEPEND} # pull in dependencies if they exist endif +ifndef AUTOMAKE # # Builtin targets for compilation variants # debug: $(MAKE) -f $(MAKEFILE) MAKEFILE=$(MAKEFILE) "ARCH=o-debug" \ "CFLAGS_DEBUG=$(CFLAGS_DEBUG_V)" \ - "CFLAGS_OPTIMIZE=$(CFLAGS_DEBUG_OPTIMIZE_V)" \ + "CFLAGS_OPTIMIZE=$(CFLAGS_OPTIMIZE_V)" \ "LDFLAGS_DEBUG=$(LDFLAGS_DEBUG_V)" $(TARGET_VA) profile: @@ -56,6 +57,7 @@ profile: MAKEFILE=$(MAKEFILE) "ARCH=o-profile" \ "CFLAGS_PROFILE=$(CFLAGS_PROFILE_V)" \ "LDFLAGS_PROFILE=$(LDFLAGS_PROFILE_V)" $(TARGET_VA) +endif # # VARIANT_VA will convert our ${ARCH} back into "" or "debug" or "profile". @@ -106,15 +108,15 @@ clean-am: clean-generic distclean-am: distclean-generic clean-am -$(RM) -r $(CLOBBER_OS) $(CLOBBER_CC) $(CLOBBER_DEPEND) +ifndef AUTOMAKE preinstall-am: preinstall: preinstall-am -ifndef AUTOMAKE distclean: distclean-am -$(RM) ./config.status clean: clean-am -endif .PHONY: distclean distclean-am .PHONY: clean clean-am +endif -- cgit v1.2.3