Use test-app, not testapp, as GNUSTEP_TYPE for test-application

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@12664 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2002-02-22 12:36:41 +00:00
parent adae9cdccb
commit 9969db1eda
4 changed files with 14 additions and 6 deletions

View file

@ -1,3 +1,10 @@
Fri Feb 22 12:33:13 2002 Nicola Pero <nicola@brainstorm.co.uk>
* Master/test-application.make: Use test-app, not testapp, as
GNUSTEP_TYPE.
* Instance/test-application.make: Updated all rules.
* test-application.make: Updated.
Fri Feb 22 12:24:17 2002 Nicola Pero <nicola@brainstorm.co.uk>
* Master/test-application.make (internal-check): Target removed.

View file

@ -25,5 +25,5 @@ endif
include $(GNUSTEP_MAKEFILES)/Instance/application.make
internal-testapp-all:: internal-app-all
internal-test_app-all:: internal-app-all

View file

@ -27,12 +27,12 @@ endif
# Building of test applications works as in application.make, except
# you can't install them!
internal-all:: $(TEST_APP_NAME:=.all.testapp.variables)
internal-all:: $(TEST_APP_NAME:=.all.test-app.variables)
_PSWRAP_C_FILES = $(foreach app,$(TEST_APP_NAME),$($(app)_PSWRAP_FILES:.psw=.c))
_PSWRAP_H_FILES = $(foreach app,$(TEST_APP_NAME),$($(app)_PSWRAP_FILES:.psw=.h))
internal-clean:: $(TEST_APP_NAME:=.clean.testapp.subprojects)
internal-clean:: $(TEST_APP_NAME:=.clean.test-app.subprojects)
rm -rf $(GNUSTEP_OBJ_DIR) $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES)
ifeq ($(OBJC_COMPILER), NeXT)
rm -f *.iconheader
@ -47,13 +47,14 @@ else
endif
endif
internal-distclean:: $(TEST_APP_NAME:=.distclean.testapp.subprojects)
internal-distclean:: $(TEST_APP_NAME:=.distclean.test-app.subprojects)
rm -rf shared_obj static_obj shared_debug_obj shared_profile_obj \
static_debug_obj static_profile_obj shared_profile_debug_obj \
static_profile_debug_obj *.app *.debug *.profile *.iconheader
$(TEST_APP_NAME)::
@$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory $@.all.testapp.variables
@$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory \
$@.all.test-app.variables
internal-install::
@ echo Skipping installation of test apps...

View file

@ -23,7 +23,7 @@ ifeq ($(GNUSTEP_INSTANCE),)
include $(GNUSTEP_MAKEFILES)/Master/test-application.make
else
ifeq ($(GNUSTEP_TYPE),testapp)
ifeq ($(GNUSTEP_TYPE),test_app)
include $(GNUSTEP_MAKEFILES)/Instance/test-application.make
endif