Fcalva/cyclone
1
0
Fork 0
mirror of https://github.com/justinethier/cyclone.git synced 2025-05-19 05:39:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use new Makefile.config format

Browse source
This commit is contained in:
Justin Ethier 2016-08-08 17:11:15 -04:00
parent 71cca4de63
commit b534657855
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -65,9 +65,9 @@ libcyclone.a: runtime.c include/cyclone/runtime.h include/cyclone/types.h gc.c d
# echo $(CC_PROG) # echo $(CC_PROG)
# echo $(CC_EXEC) # echo $(CC_EXEC)
# echo $(CC_LIB) # echo $(CC_LIB)
$(CC) $(CFLAGS) -c -Iinclude dispatch.c -o dispatch.o $(CC) $(CFLAGS) -c dispatch.c -o dispatch.o
$(CC) $(CFLAGS) -std=gnu99 -c -Iinclude gc.c -o gc.o $(CC) $(CFLAGS) -std=gnu99 -c gc.c -o gc.o
$(CC) $(CFLAGS) -c -Iinclude \ $(CC) $(CFLAGS) -c \
-DCYC_INSTALL_DIR=\"$(PREFIX)\" \ -DCYC_INSTALL_DIR=\"$(PREFIX)\" \
-DCYC_INSTALL_LIB=\"$(LIBDIR)\" \ -DCYC_INSTALL_LIB=\"$(LIBDIR)\" \
-DCYC_INSTALL_INC=\"$(INCDIR)\" \ -DCYC_INSTALL_INC=\"$(INCDIR)\" \

9
Makefile.config
View file

@ -7,14 +7,15 @@
# Use these lines instead for debugging or profiling # Use these lines instead for debugging or profiling
#CFLAGS = -g -Wall #CFLAGS = -g -Wall
#CFLAGS = -g -pg -Wall #CFLAGS = -g -pg -Wall
CFLAGS ?= -O2 -Wall -I$(PREFIX)/include -L$(PREFIX)/lib CFLAGS ?= -O2 -Wall -Iinclude -L.
COMP_CFLAGS ?= -O2 -Wall -I$(PREFIX)/include -L$(PREFIX)/lib
CC ?= cc CC ?= cc
LIBS = -pthread -lcyclone -lck -lm LIBS = -pthread -lcyclone -lck -lm
# Commands "baked into" cycone for invoking the C compiler # Commands "baked into" cycone for invoking the C compiler
CC_PROG ?= "$(CC) ~src-file~ $(CFLAGS) -c -o ~exec-file~.o" CC_PROG ?= "$(CC) ~src-file~ $(COMP_CFLAGS) -c -o ~exec-file~.o"
CC_EXEC ?= "$(CC) ~exec-file~.o ~obj-files~ $(LIBS) $(CFLAGS) -o ~exec-file~" CC_EXEC ?= "$(CC) ~exec-file~.o ~obj-files~ $(LIBS) $(COMP_CFLAGS) -o ~exec-file~"
CC_LIB ?= "$(CC) ~src-file~ $(CFLAGS) -c -o ~exec-file~.o" CC_LIB ?= "$(CC) ~src-file~ $(COMP_CFLAGS) -c -o ~exec-file~.o"
AR ?= ar AR ?= ar
#CD ?= cd #CD ?= cd