Skip to content

Commit f7953dd

Browse files
author
philmoz
committed
Makefiles cleanup final part - core CHDK code (excluding modules).
1 parent 6b3016c commit f7953dd

File tree

9 files changed

+48
-71
lines changed

9 files changed

+48
-71
lines changed

‎CHDK/Makefile

+15-36
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
topdir=../
22

3-
SKIPPLATFORMCHECK=1
4-
5-
include $(topdir)makefile.inc
3+
include $(topdir)makefile_base.inc
64

75
ifndef OPT_DE_VERSION
86
LOGO=logo.dat
@@ -22,51 +20,32 @@ all: $(GENLUA)
2220
@echo "copy modules"
2321
mkdir -p MODULES
2422
rm -f MODULES/*
25-
cp $(topdir)modules/$O*.flt MODULES
26-
27-
LUALIB/GEN/propset1.lua: $(topdir)include/propset1.h
28-
@echo "->" $@
29-
sed -n -f $(topdir)tools/gen_propset_lua.sed < $< > $@
30-
31-
LUALIB/GEN/propset2.lua: $(topdir)include/propset2.h
32-
@echo "->" $@
33-
sed -n -f $(topdir)tools/gen_propset_lua.sed < $< > $@
34-
35-
LUALIB/GEN/propset3.lua: $(topdir)include/propset3.h
36-
@echo "->" $@
37-
sed -n -f $(topdir)tools/gen_propset_lua.sed < $< > $@
38-
39-
LUALIB/GEN/propset4.lua: $(topdir)include/propset4.h
40-
@echo "->" $@
41-
sed -n -f $(topdir)tools/gen_propset_lua.sed < $< > $@
42-
43-
LUALIB/GEN/propset5.lua: $(topdir)include/propset5.h
44-
@echo "->" $@
45-
sed -n -f $(topdir)tools/gen_propset_lua.sed < $< > $@
23+
cp $(modules)/$O*.flt MODULES
4624

47-
LUALIB/GEN/propset6.lua: $(topdir)include/propset6.h
25+
# Rule for creating Lua propset files
26+
LUALIB/GEN/propset%.lua: $(include)/propset%.h
4827
@echo "->" $@
49-
sed -n -f $(topdir)tools/gen_propset_lua.sed < $< > $@
28+
sed -n -f $(tools)/gen_propset_lua.sed < $< > $@
5029

51-
LUALIB/GEN/modelist.lua: $(topdir)include/modelist.h
30+
LUALIB/GEN/modelist.lua: $(include)/modelist.h
5231
@echo "->" $@
53-
sed -n -f $(topdir)tools/gen_modelist_lua.sed < $< > $@
32+
sed -n -f $(tools)/gen_modelist_lua.sed < $< > $@
5433

55-
LUALIB/GEN/cnf_core.lua: $(topdir)core/conf.c $(topdir)tools/gen_conf_lua$(EXE)
34+
LUALIB/GEN/cnf_core.lua: $(core)/conf.c $(tools)/gen_conf_lua$(EXE)
5635
@echo "->" $@
57-
$(topdir)tools/gen_conf_lua$(EXE) $(topdir)core/conf.c conf_info 1000 > $@
36+
$(tools)/gen_conf_lua$(EXE) $(core)/conf.c conf_info 1000 > $@
5837

59-
LUALIB/GEN/cnf_osd.lua: $(topdir)core/conf.c $(topdir)tools/gen_conf_lua$(EXE)
38+
LUALIB/GEN/cnf_osd.lua: $(core)/conf.c $(tools)/gen_conf_lua$(EXE)
6039
@echo "->" $@
61-
$(topdir)tools/gen_conf_lua$(EXE) $(topdir)core/conf.c osd_conf_info 2000 > $@
40+
$(tools)/gen_conf_lua$(EXE) $(core)/conf.c osd_conf_info 2000 > $@
6241

63-
LUALIB/GEN/cnf_user.lua: $(topdir)core/conf.c $(topdir)tools/gen_conf_lua$(EXE)
42+
LUALIB/GEN/cnf_user.lua: $(core)/conf.c $(tools)/gen_conf_lua$(EXE)
6443
@echo "->" $@
65-
$(topdir)tools/gen_conf_lua$(EXE) $(topdir)core/conf.c user_menu_conf_info 3000 > $@
44+
$(tools)/gen_conf_lua$(EXE) $(core)/conf.c user_menu_conf_info 3000 > $@
6645

67-
LUALIB/GEN/cnf_gps.lua: $(topdir)core/conf.c $(topdir)tools/gen_conf_lua$(EXE)
46+
LUALIB/GEN/cnf_gps.lua: $(core)/conf.c $(tools)/gen_conf_lua$(EXE)
6847
@echo "->" $@
69-
$(topdir)tools/gen_conf_lua$(EXE) $(topdir)core/conf.c gps_conf_info 4000 > $@
48+
$(tools)/gen_conf_lua$(EXE) $(core)/conf.c gps_conf_info 4000 > $@
7049

7150
clean:
7251
rm -f $(GENLUA)

‎lib/core/Makefile

+5-9
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@ topdir=../../
33
# Makefile for platform independent 'core' library
44
# builds code from core and modules that only needs to be compiled once across all camera/firmware versions
55

6-
SKIPPLATFORMCHECK=1
7-
8-
include $(topdir)makefile.inc
9-
10-
CFLAGS+=$(CTHUMB) -DCHDK_MODULE_CODE
6+
include $(topdir)makefile_core.inc
117

128
OBJS = $Ogui_batt.o $Ogui_space.o $Ogui_usb.o $Ogui_mbox.o $Ogps.o $Ogui_script.o $Ogui_menu.o $Ogui_user_menu.o
139
OBJS+= $Osuba.o $Olevent.o $Oconsole.o $Ogps_math.o $Olive_view.o $Optp.o $Oaction_stack.o $Oscript.o
@@ -18,14 +14,14 @@ all: $Olibcore.a
1814

1915
$Olibcore.a: $(OBJS)
2016

21-
$Omodule_load.o: $(topdir)modules/module_load.c $(topdir)modules/module_load.h $(topdir)modules/module_exportlist.h
22-
$Omodule_hashlist.o: $(topdir)modules/module_hashlist.c
17+
$Omodule_load.o: $(modules)/module_load.c $(modules)/module_load.h $(modules)/module_exportlist.h
18+
$Omodule_hashlist.o: $(modules)/module_hashlist.c
2319
@echo $< \-\> $@
2420
$(CC) $(CFLAGS) -nostdinc -fno-builtin -c -o $@ $<
2521

26-
$(topdir)modules/module_hashlist.c: $(topdir)modules/module_exportlist.c $(topdir)modules/module_exportlist$(ABI).inc $(topdir)/tools/makeexport$(EXE)
22+
$(modules)/module_hashlist.c: $(modules)/module_exportlist.c $(modules)/module_exportlist$(ABI).inc $(tools)/makeexport$(EXE)
2723
@echo $< \-\> $@
28-
$(topdir)tools/makeexport$(EXE) $(topdir)modules/module_exportlist.h $(topdir)/modules/exportlist.inc $(topdir)modules/module_hashlist.c $(topdir)modules/module_exportlist.c $(topdir)modules/module_exportlist$(ABI).inc
24+
$(tools)/makeexport$(EXE) $(modules)/module_exportlist.h $(modules)/exportlist.inc $(modules)/module_hashlist.c $(modules)/module_exportlist.c $(modules)/module_exportlist$(ABI).inc
2925

3026
clean:
3127
rm -f $O*.* *.o *.a

‎lib/font/Makefile

+3-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
topdir=../../
22

3-
SKIPPLATFORMCHECK=1
4-
5-
include $(topdir)makefile.inc
6-
7-
CFLAGS+=$(CTHUMB) -DCHDK_MODULE_CODE
3+
include $(topdir)makefile_core.inc
84

95
OBJS = $Ofont_8x16.o $Orbf_font.o
106

@@ -14,8 +10,8 @@ $Olibfont.a: $(OBJS)
1410

1511
$Ofont_8x16.o: font_8x16.c font_8x16_uni_packed.h
1612

17-
font_8x16_uni_packed.h: font_8x16_uni.h codepages.h $(topdir)tools/font_8x16_pack$(EXE)
18-
$(topdir)tools/font_8x16_pack$(EXE) > font_8x16_uni_packed.h
13+
font_8x16_uni_packed.h: font_8x16_uni.h codepages.h $(tools)/font_8x16_pack$(EXE)
14+
$(tools)/font_8x16_pack$(EXE) > font_8x16_uni_packed.h
1915

2016
clean:
2117
rm -f $O*.* *.o *.a

‎lib/lang/Makefile

+4-8
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,18 @@
11
topdir=../../
22

3-
SKIPPLATFORMCHECK=1
4-
5-
include $(topdir)makefile.inc
6-
7-
CFLAGS+=$(CTHUMB) -DCHDK_MODULE_CODE
3+
include $(topdir)makefile_core.inc
84

95
OBJS = $Olang.o $Olang_str.o $Ofileutil.o
106

117
all: $Oliblang.a
128

139
$Oliblang.a: $(OBJS)
1410

15-
$Olang_str.o: lang_str.c lang_str.h $(topdir)core/gui_lang.h
11+
$Olang_str.o: lang_str.c lang_str.h $(core)/gui_lang.h
1612

17-
lang_str.h: $(topdir)tools/makelang$(EXE) $(topdir)CHDK/LANG/english.lng $(topdir)CHDK/LANG/$(OPT_DEFAULT_LANG).lng
13+
lang_str.h: $(tools)/makelang$(EXE) $(chdk)/LANG/english.lng $(chdk)/LANG/$(OPT_DEFAULT_LANG).lng
1814
@echo $< \-\> $@
19-
$(topdir)tools/makelang$(EXE) $(topdir)CHDK/LANG/english.lng $(topdir)CHDK/LANG/$(OPT_DEFAULT_LANG).lng > lang_str.h
15+
$(tools)/makelang$(EXE) $(chdk)/LANG/english.lng $(chdk)/LANG/$(OPT_DEFAULT_LANG).lng > lang_str.h
2016

2117
clean:
2218
rm -f $O*.* *.o *.a

‎lib/libc/Makefile

+1-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@ topdir=../../
33
# Makefile for platform independent 'libc' library
44
# Code copied from GCC for linking modules without including GCC library
55

6-
SKIPPLATFORMCHECK=1
7-
8-
include $(topdir)makefile.inc
9-
10-
CFLAGS+=$(CTHUMB)
6+
include $(topdir)makefile_core.inc
117

128
OBJS = $Othumb1_case.o
139

‎lib/math/Makefile

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
topdir=../../
22

3-
SKIPPLATFORMCHECK=1
4-
5-
include $(topdir)makefile.inc
6-
7-
CFLAGS+=$(CTHUMB) -DCHDK_MODULE_CODE
3+
include $(topdir)makefile_core.inc
84

95
OBJS = $Od2d.o $Owrapper.o
106

‎makefile.inc

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# *************
2+
# Legacy makefile - no longer used (see other makefile_???.inc files)
3+
#
4+
# Kept temporarily for CHDK-Shell compatibility
5+
# Changing this file will have no effect on CHDK build
6+
# *************
17

28
# Define default target (place this first so it is always selected if no target on command line)
39
.PHONY: default

‎makefile_arm.inc

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ include $(topdir)build_rules.inc
99

1010
# Define empty recipes for source files (including the makefiles)
1111
# to prevent make from trying implicit rules to create them. Speeds up build process
12-
$(topdir)makefile.inc: ;
12+
$(topdir)makefile_arm.inc: ;

‎makefile_core.inc

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# Build rules for platform independant code (except modules) - code built in THUMB mode
2+
3+
include $(topdir)makefile_base.inc
4+
include $(topdir)arm_rules.inc
5+
6+
CFLAGS+=-mthumb -mthumb-interwork -DCHDK_MODULE_CODE
7+
8+
include $(topdir)build_rules.inc
9+
10+
# Define empty recipes for source files (including the makefiles)
11+
# to prevent make from trying implicit rules to create them. Speeds up build process
12+
$(topdir)makefile_core.inc: ;

0 commit comments

Comments
 (0)