- fixed WORK_DIR

git-svn-id: http://moon:8086/svn/vhdl/trunk@1444 cc03376c-175c-47c8-b038-4cd826a8556b

Common/make/ghdl.mk

@@ -6,7 +6,6 @@
 # WITH_GHW
 TARGET ?= default
 ENTITY ?= default
-WORK_DIR ?= work
 WORK_LIB ?= work
 LANG_STD ?= 93c
 IEEE_STD ?= standard
@@ -14,10 +13,11 @@ RUN_TIME ?= 1000ns
 
 # Build path
 BUILD_DIR ?= build/$(TARGET)
+WORK_DIR ?= $(BUILD_DIR)/$(WORK_LIB)
 
 # Can be pre-initialized by user
 RUN_OPTS += --stop-time=$(RUN_TIME)
-GHDL_OPTS += --work=$(WORK_LIB) --workdir=$(BUILD_DIR)/$(WORK_DIR) --std=$(LANG_STD) --ieee=$(IEEE_STD)
+GHDL_OPTS += --work=$(WORK_LIB) --workdir=$(WORK_DIR) --std=$(LANG_STD) --ieee=$(IEEE_STD)
 
 # -------------------------------------------------
 
@@ -37,7 +37,7 @@ GTK_OPTS-$(WITH_GHW) := --wave=$(SIM_FILE-y)
 # Targets
 all:  analyze
 
-$(BUILD_DIR)/$(WORK_DIR):
+$(WORK_DIR):
 	mkdir -p $@
 	
 syntax: 
@@ -46,10 +46,10 @@ syntax:
 import:
 	$(GHDL) -i $(GHDL_OPTS) $(SRCS)
 
-analyze: $(BUILD_DIR)/$(WORK_DIR) $(SRCS)
+analyze: $(WORK_DIR) $(SRCS)
 	$(GHDL) -a $(GHDL_OPTS) $(SRCS)
 	
-anaborate: $(BUILD_DIR)/$(WORK_DIR) $(SRCS)
+anaborate: $(WORK_DIR) $(SRCS)
 	$(GHDL) -c $(GHDL_OPTS) -o $(BUILD_DIR)/$(TARGET) $(SRCS) -e $(ENTITY)
 	
 makeunit: analyze
@@ -71,7 +71,7 @@ show: run_show
 	exec gtkwave -f $(SIM_FILE-y) -a $(BUILD_DIR)/$(TARGET).gtkw &
 	
 clean:
-	rm -rf $(BUILD_DIR)/$(WORK_DIR)
+	rm -rf $(WORK_DIR)
 	rm -f $(BUILD_DIR)/$(TARGET)*.vcd
 	rm -f $(BUILD_DIR)/$(TARGET)*.fst
 	rm -f $(BUILD_DIR)/$(TARGET)*.ghw
@@ -79,7 +79,7 @@ clean:
 	rm -f $(BUILD_DIR)/$(TARGET)*.o	
 				
 mrproper:
-	rm -rf $(WORK_DIR)
+	rm -rf $(BUILD_DIR)
 	
 	
 

Common/sim/ieee_proposed/modelsim/Makefile.ghdl

@@ -7,7 +7,6 @@
 # -------------------------------------------------
 LANG_STD := 93c
 IEEE_STD := standard
-WORK_DIR := ieee_proposed
 WORK_LIB := ieee_proposed