From 0cc899aad4ac4511afdd93713502e05e1e81de2e Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Thu, 27 Aug 2015 10:13:19 +0000 Subject: [PATCH] ndprism executable: tidy Makefile and disable building on Windows (Cygwin) for now. git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10590 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- prism/src/prism/Makefile | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/prism/src/prism/Makefile b/prism/src/prism/Makefile index 78361053..62e786b9 100644 --- a/prism/src/prism/Makefile +++ b/prism/src/prism/Makefile @@ -31,7 +31,7 @@ O_FILES = $(CC_FILES:%.cc=$(PRISM_DIR_REL)/$(OBJ_DIR)/$(THIS_DIR)/%.o) default: all -all: checks $(CLASS_FILES) $(PRISM_DIR_REL)/$(INCLUDE_DIR)/PrismNative.h $(PRISM_DIR_REL)/$(LIB_DIR)/$(LIBPREFIX)prism$(LIBSUFFIX) $(PRISM_DIR_REL)/$(OBJ_DIR)/$(THIS_DIR)/ngprism +all: checks $(CLASS_FILES) $(PRISM_DIR_REL)/$(INCLUDE_DIR)/PrismNative.h $(PRISM_DIR_REL)/$(LIB_DIR)/$(LIBPREFIX)prism$(LIBSUFFIX) $(PRISM_DIR_REL)/$(OBJ_DIR)/$(THIS_DIR)/ngprism$(EXE) # Try and prevent accidental makes (i.e. called manually, not from top-level Makefile) checks: @@ -54,11 +54,16 @@ $(PRISM_DIR_REL)/$(LIB_DIR)/$(LIBPREFIX)prism$(LIBSUFFIX): $(O_FILES) $(PRISM_DIR_REL)/$(OBJ_DIR)/$(THIS_DIR)/%.o: %.cc $(CPP) $(CPPFLAGS) -c $< -o $@ $(INCLUDES) -$(PRISM_DIR_REL)/$(OBJ_DIR)/$(THIS_DIR)/ngprism: ngprism.c - $(C) $(CPPFLAGS) -o $@ $< +# Don't build ngprism on Windows/Cygwin for now +$(PRISM_DIR_REL)/$(OBJ_DIR)/$(THIS_DIR)/ngprism$(EXE): ngprism.c + @if [ "$(EXE)" = "" ]; then \ + $(C) $(LDFLAGS) $(CPPFLAGS) -o $@ $<; \ + else \ + touch $@; \ + fi; clean: checks - @rm -f $(CLASS_FILES) $(PRISM_DIR_REL)/$(LIB_DIR)/$(LIBPREFIX)prism$(LIBSUFFIX) $(O_FILES) + @rm -f $(CLASS_FILES) $(PRISM_DIR_REL)/$(LIB_DIR)/$(LIBPREFIX)prism$(LIBSUFFIX) $(O_FILES) $(PRISM_DIR_REL)/$(OBJ_DIR)/$(THIS_DIR)/ngprism$(EXE) celan: clean