gwh/saturnng
1
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

cleanup Makefile

Browse source
This commit is contained in:
Gwenhael Le Moine 2024-08-25 18:37:05 +02:00
parent b4ffa28a15
commit 4f98fb7258
No known key found for this signature in database
GPG key ID: FDFE3669426707A7
3 changed files with 15 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Makefile
View file

@ -7,19 +7,16 @@
# https://opensource.org/license/MIT. # https://opensource.org/license/MIT.
PREFIX = /usr PREFIX = /usr
DOCDIR = $(PREFIX)/doc/x48ng DOCDIR = $(PREFIX)/doc/saturn
MANDIR = $(PREFIX)/man
OPTIM ?= 2 OPTIM ?= 2
CFLAGS ?= -g -O$(OPTIM) -I./src/ -D_GNU_SOURCE=1 -I./libChf -L./libChf/st_build -lutil CFLAGS ?= -g -O$(OPTIM) -I./src/ -D_GNU_SOURCE=1 -I./libChf -L./libChf/st_build -lutil
LIBS = -lm -lChf -lXm LIBS = -lm -lChf -lXm
X11CFLAGS = $(shell pkg-config --cflags x11 xext) -D_GNU_SOURCE=1 X11CFLAGS = $(shell pkg-config --cflags x11 xext)
X11LIBS = $(shell pkg-config --libs x11 xext xt) X11LIBS = $(shell pkg-config --libs x11 xext xt)
CFLAGS += $(X11CFLAGS)
LIBS += $(X11LIBS)
FULL_WARNINGS = no FULL_WARNINGS = no
DOTOS = src/cpu.o \ DOTOS = src/cpu.o \
@ -90,12 +87,10 @@ override CFLAGS := -std=c11 \
$(call cc-option,-Wlogical-op) \ $(call cc-option,-Wlogical-op) \
$(call cc-option,-Wno-unknown-warning-option) \ $(call cc-option,-Wno-unknown-warning-option) \
$(EXTRA_WARNING_FLAGS) \ $(EXTRA_WARNING_FLAGS) \
$(X11CFLAGS) \
$(CFLAGS) $(CFLAGS)
override CPPFLAGS := -I./src/ -D_GNU_SOURCE=1 \ override CPPFLAGS := -I./src/ -D_GNU_SOURCE=1 \
-DVERSION_MAJOR=$(VERSION_MAJOR) \
-DVERSION_MINOR=$(VERSION_MINOR) \
-DPATCHLEVEL=$(PATCHLEVEL) \
$(CPPFLAGS) $(CPPFLAGS)
.PHONY: all clean clean-all pretty-code install mrproper get-roms install .PHONY: all clean clean-all pretty-code install mrproper get-roms install
@ -107,7 +102,7 @@ libChf/st_build/libChf.a:
make -C libChf make -C libChf
dist/saturn: $(DOTOS) libChf/st_build/libChf.a dist/saturn: $(DOTOS) libChf/st_build/libChf.a
$(CC) $^ -o $@ $(CFLAGS) $(LIBS) $(CC) $^ -o $@ $(CFLAGS) $(LIBS) $(X11LIBS)
dist/pack: src/pack.o src/disk_io.o src/debug.o libChf/st_build/libChf.a dist/pack: src/pack.o src/disk_io.o src/debug.o libChf/st_build/libChf.a
$(CC) $^ -o $@ $(CFLAGS) $(LIBS) $(CC) $^ -o $@ $(CFLAGS) $(LIBS)

20
src/hw_config.c
View file

@ -166,11 +166,11 @@ table[] =
{"hp48", {"hp48",
{ /* name, id, access_prio, { /* name, id, access_prio,
init, save, init, save,
read, write, read, write,
r_config, r_abs_base_addr, r_size, r_config, r_abs_base_addr, r_size,
map_flags map_flags
*/ */
{ {
"ROM (ROM)", "ROM (ROM)",
@ -257,11 +257,11 @@ table[] =
{"hp49", {"hp49",
{ /* name, id, access_prio, { /* name, id, access_prio,
init, save, init, save,
read, write, read, write,
r_config, r_abs_base_addr, r_size, r_config, r_abs_base_addr, r_size,
map_flags map_flags
*/ */
{ {
"ROM (ROM)", "ROM (ROM)",

2
src/main.c
View file

@ -102,7 +102,7 @@ static char rcs_id[] = "$Id: saturn.c,v 4.1 2000/12/11 09:54:19 cibrario Rel $";
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <setjmp.h> // #include <setjmp.h>
#include <string.h> /* 3.1: strcpy(), strcat() */ #include <string.h> /* 3.1: strcpy(), strcat() */
#include <unistd.h> /* isatty() */ #include <unistd.h> /* isatty() */