X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=ad8c9411c7467b647c7e3ad2cb14de64bf07e0ff;hb=2652353f507345d485aef3b4e5fba5b2267d9a60;hp=a44b6ea6322af4c92148a32a813ed2610154f0c9;hpb=1fa67577e0560b592a6b60658718e5f037543932;p=xonotic%2Fgmqcc.git

diff --git a/Makefile b/Makefile
index a44b6ea..ad8c941 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,9 @@
+DESTDIR :=
+PREFIX := /usr/local
+BINDIR := $(PREFIX)/bin
+
 CC     ?= clang
-CFLAGS += -Wall -I. -fomit-frame-pointer -fno-stack-protector
+CFLAGS += -Wall -I. -fomit-frame-pointer -fno-stack-protector -fno-common
 #turn on tons of warnings if clang is present
 ifeq ($(CC), clang)
 	CFLAGS +=                  \
@@ -24,11 +28,10 @@ OBJ     = \
           code.o      \
           ast.o       \
           ir.o        \
-          error.o
-OBJ_A = test/ast-test.o
-OBJ_I = test/ir-test.o
+          con.o       \
+          ftepp.o
 OBJ_C = main.o lexer.o parser.o
-OBJ_X = exec-standalone.o util.o
+OBJ_X = exec-standalone.o util.o con.o
 
 #default is compiler only
 default: gmqcc
@@ -38,23 +41,28 @@ default: gmqcc
 exec-standalone.o: exec.c
 	$(CC) -c $< -o $@ $(CFLAGS) -DQCVM_EXECUTOR=1
 
-# test targets
-test_ast: $(OBJ_A) $(OBJ)
-	$(CC) -o $@ $^ $(CFLAGS)
-test_ir:  $(OBJ_I) $(OBJ)
-	$(CC) -o $@ $^ $(CFLAGS)
 qcvm:     $(OBJ_X)
 	$(CC) -o $@ $^ $(CFLAGS) -lm
-test: test_ast test_ir
 
 # compiler target
 gmqcc: $(OBJ_C) $(OBJ)
 	$(CC) -o $@ $^ $(CFLAGS)
 
-#all target is test and all
-all: test gmqcc
+all: gmqcc qcvm
 
 clean:
-	rm -f *.o gmqcc qcvm test_ast test_ir test/*.o
-	
+	rm -f *.o gmqcc qcvm
+
+$(OBJ) $(OBJ_C) $(OBJ_X): gmqcc.h
+main.o: lexer.h
+parser.o: ast.h lexer.h
+ast.o: ast.h ir.h
+ir.o: ir.h
 
+install: install-gmqcc install-qcvm
+install-gmqcc: gmqcc
+	install -d -m755          $(DESTDIR)$(BINDIR)
+	install    -m755  gmqcc   $(DESTDIR)$(BINDIR)/gmqcc
+install-qcvm: qcvm
+	install -d -m755          $(DESTDIR)$(BINDIR)
+	install    -m755  qcvm    $(DESTDIR)$(BINDIR)/qcvm