From 2b899c20e5409d18357866db3f65d4cab037b0e0 Mon Sep 17 00:00:00 2001
From: Eliah Rebstock <elireb54@outlook.com>
Date: Thu, 19 Jul 2018 00:10:14 +0200
Subject: [PATCH] Try fixing
---
log/Makefile | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/log/Makefile b/log/Makefile
index 075cfe1..7185c85 100644
--- a/log/Makefile
+++ b/log/Makefile
@@ -48,9 +48,9 @@ CC = $(CHIPMUNKCC)
CHIPMUNKFLAGS = $(ARCH_OPT)
-CFLAGS = $(CHIPMUNKFLAGS) -I$(LOGINC) -I$(LOCINC) -I$(XINCLUDEDIR) -DLOGLIB=\"$(LOGLIBDIR)\" -DF_OK=0
+STDC = c11
-VPATH = src
+CFLAGS = $(CHIPMUNKFLAGS) -I$(LOGINC) -I$(LOCINC) -I$(XINCLUDEDIR) -DLOGLIB=\"$(LOGLIBDIR)\" -DF_OK=0 -std=$(STDC) -g -Wall -Wextra
DIGOBJ = $(TARGET_DIR)/logsim.o $(TARGET_DIR)/logdig.o $(TARGET_DIR)/logsimasm.o $(TARGET_DIR)/logsimed.o $(TARGET_DIR)/diggates.o \
$(TARGET_DIR)/loghier.o $(TARGET_DIR)/logsimh.o $(TARGET_DIR)/swap.o
@@ -68,9 +68,11 @@ ANAOBJ = $(TARGET_DIR)/ana/globals.o $(TARGET_DIR)/ana/nsolver.o $(TARGET_DIR)/a
SIMOBJ = $(TARGET_DIR)/logcom.o $(DIGOBJ) $(ANAOBJ)
TOOLOBJ = $(SIMOBJ) $(TARGET_DIR)/logspc.o $(TARGET_DIR)/logntk.o
+
+$(TARGET_DIR)/ana/%.o: $(SRC_DIR)/ana/%.c
$(TARGET_DIR)/%.o: $(SRC_DIR)/%.c
@mkdir -p $(@D)
- $(CC) -c $(CFLAGS) $(LIBP2C) $(LIBX11) $(OTHERLIBS) $< -o $@
+ $(CC) -c $(CFLAGS) $(LIBX11) $(OTHERLIBS) $< -o $@
install: all
@@ -107,8 +109,6 @@ $(SRC_DIR)/tooldir.c: $(TOOLOBJ)
chmod +x $(TOOLS_DIR)/munch
$(TOOLS_DIR)/munch 'Log_[a-zA-Z0-9_]*' $(TOOLOBJ) > $(SRC_DIR)/tooldir.c
-
-
$(TARGET_DIR)/simdir.o: $(SRC_DIR)/simdir.c
$(SRC_DIR)/simdir.c: $(SIMOBJ)
--
GitLab