Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit d97a4aa

Browse files
runrevmarkrunrevmark
committed
Split up Linux makefiles to enable building of commercial and community.
1 parent 783ea85 commit d97a4aa

13 files changed

+175
-108
lines changed

‎Makefile‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
.PHONY: libexternal libexternalv1 libz libjpeg libpcre libpng libplugin libcore
66
.PHONY: revsecurity libgif
77
.PHONY: kernel development standalone webruntime webplugin webplayer server
8+
.PHONY: kernel-standalone kernel-development kernel-server
89
.PHONY: libireviam onrev-server
910

1011
libexternal:
@@ -37,17 +38,26 @@ libcore:
3738
kernel: libz libgif libjpeg libpcre libpng libopenssl libexternal libcore
3839
$(MAKE) -C ./engine -f Makefile.kernel libkernel
3940

40-
development: libz libgif libjpeg libpcre libpng libopenssl libexternal libcore kernel
41-
$(MAKE) -C ./engine -f Makefile.development engine
41+
kernel-standalone: kernel
42+
$(MAKE) -C ./engine -f Makefile.kernel-standalone libkernel-standalone
4243

43-
standalone: libz libgif libjpeg libpcre libpng libopenssl libcore kernel revsecurity
44-
$(MAKE) -C ./engine -f Makefile.standalone standalone
44+
kernel-development: kernel
45+
$(MAKE) -C ./engine -f Makefile.kernel-development libkernel-development
46+
47+
kernel-server: kernel
48+
$(MAKE) -C ./engine -f Makefile.kernel-server libkernel-server
49+
50+
development: libz libgif libjpeg libpcre libpng libopenssl libexternal libcore kernel kernel-development
51+
$(MAKE) -C ./engine -f Makefile.development engine-community
52+
53+
standalone: libz libgif libjpeg libpcre libpng libopenssl libcore kernel revsecurity kernel-standalone
54+
$(MAKE) -C ./engine -f Makefile.standalone standalone-community
4555

4656
installer: libz libgif libjpeg libpcre libpng libopenssl libexternal libcore kernel
4757
$(MAKE) -C ./engine -f Makefile.installer installer
4858

49-
server: libz libgif libjpeg libpcre libpng libopenssl libexternal libcore kernel revsecurity
50-
$(MAKE) -C ./engine -f Makefile.server server
59+
server: libz libgif libjpeg libpcre libpng libopenssl libexternal libcore kernel kernel-server revsecurity
60+
$(MAKE) -C ./engine -f Makefile.server server-community
5161

5262
###############################################################################
5363
# revPDFPrinter Targets

‎engine/Makefile‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,28 @@
1-
.PHONY: engine standalone runtime kernel newruntime server
1+
.PHONY: engine standalone runtime kernel newruntime server kernel-standalone kernel-development kernel-server
22

33
kernel:
44
$(MAKE) -f Makefile.kernel libkernel
55

6-
engine: kernel
7-
$(MAKE) -f Makefile.development engine
8-
if [ -e ../_build/linux/debug/engine ]; then cp ../_build/linux/debug/engine revolution.debug.x86; fi
9-
if [ -e ../_build/linux/release/engine ]; then cp ../_build/linux/release/engine revolution.release.x86; fi
6+
kernel-standalone:
7+
$(MAKE) -f Makefile.kernel-standalone libkernel-standalone
108

11-
standalone: kernel
12-
$(MAKE) -f Makefile.standalone standalone
9+
kernel-development:
10+
$(MAKE) -f Makefile.kernel-development libkernel-development
11+
12+
kernel-server:
13+
$(MAKE) -f Makefile.kernel-server libkernel-server
14+
15+
engine: kernel kernel-development
16+
$(MAKE) -f Makefile.development engine-community
17+
18+
standalone: kernel kernel-standalone
19+
$(MAKE) -f Makefile.standalone standalone-community
1320

1421
installer: kernel
1522
$(MAKE) -f Makefile.installer installer
1623

17-
server:
18-
$(MAKE) -f Makefile.server server
24+
server: kernel-server
25+
$(MAKE) -f Makefile.server server-community
1926

2027
clean:
2128
$(MAKE) -f Makefile.development clean

‎engine/Makefile.common‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
SOURCES= \
22
$(MODE_SOURCES)
3-
4-
SOURCE_DIRS=\
5-
unix
63

74
CUSTOM_DEFINES=\
85
LINUX \
@@ -15,9 +12,9 @@ CUSTOM_INCLUDES=\
1512
./src \
1613
$(MODE_INCLUDES)
1714

18-
CUSTOM_DEPS=libkernel.a libcore.a libpng.a libpcre.a libjpeg.a
15+
CUSTOM_DEPS= libkernel.a libcore.a libpng.a libpcre.a libjpeg.a $(MODE_DEPS)
1916

20-
CUSTOM_LIBS=kernel core z gif png pcre jpeg openssl $(MODE_LIBS)
17+
CUSTOM_LIBS=$(MODE_LIBS) kernel core z gif png pcre jpeg openssl
2118
CUSTOM_STATIC_LIBS=stdc++ $(MODE_STATIC_LIBS)
2219
CUSTOM_DYNAMIC_LIBS=dl X11 m Xext pthread $(MODE_DYNAMIC_LIBS)
2320

@@ -29,4 +26,4 @@ CUSTOM_CCFLAGS=\
2926
CUSTOM_LDFLAGS=-static-libgcc \
3027
$(MODE_LDFLAGS) -Wl,-rpath,\$$ORIGIN
3128

32-
include ../rules/application.linux.makefile
29+
include $(dir $(lastword $(MAKEFILE_LIST)))/../rules/application.linux.makefile

‎engine/Makefile.development‎

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,16 @@
1-
NAME=engine
1+
NAME=engine-community
22
TYPE=application
33

44
MODE_SOURCES= \
5-
ide.cpp internal_development.cpp lextable.cpp mode_development.cpp \
6-
startupstack.cpp deploy.cpp deploy_linux.cpp deploy_windows.cpp \
7-
deploy_macosx.cpp deploy_capsule.cpp deploy_sign.cpp deploy_file.cpp \
8-
deploy_dmg.cpp \
5+
stacksecurity.cpp \
96
deploysecurity.cpp \
10-
bsdiff_build.cpp encodederrors.cpp
7+
startupstack.cpp
118

12-
MODE_DEFINES=\
13-
MODE_DEVELOPMENT
9+
MODE_DEPS=libkernel-development.a
10+
11+
MODE_LIBS=kernel-development
1412

1513
startupstack.cpp: src/Environment.rev
1614
../prebuilt/bin/Revolution.lnx "./compress_data.rev" "./src/Environment.rev" "./src/startupstack.cpp" "MCstartupstack"
1715

18-
hashedstrings.cpp: src/lextable.cpp
19-
../prebuilt/bin/Revolution.lnx "./hash_strings.rev" "./src/lextable.cpp" "./src/hashedstrings.cpp" "../prebuilt/bin/perfect.lnx"
20-
21-
encodederrors.cpp: src/executionerrors.h src/parseerrors.h
22-
../prebuilt/bin/Revolution.lnx "./encode_errors.rev" "./src" "./src/encodederrors.cpp"
23-
24-
engine: hashedstrings.cpp
25-
2616
include Makefile.common

‎engine/Makefile.kernel‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -45,20 +45,7 @@ SOURCES=\
4545
redraw.cpp tilecache.cpp tilecachesw.cpp syslnxregion.cpp fieldstyledtext.cpp paragrafattr.cpp \
4646
fonttable.cpp fieldrtf.cpp fieldhtml.cpp stackcache.cpp
4747

48-
CUSTOM_DEFINES=\
49-
LINUX \
50-
X11 TARGET_PLATFORM_LINUX TARGET_PLATFORM_POSIX \
51-
GTKTHEME \
52-
HAVE___THREAD
53-
54-
CUSTOM_INCLUDES=\
55-
./src
56-
57-
CUSTOM_CCFLAGS=\
58-
-Wall -Wno-unused-variable -Wno-switch -Wno-non-virtual-dtor -fno-exceptions -fno-rtti \
59-
-fmessage-length=0
60-
6148
linuxstubs.cpp: src/linux.stubs
6249
../prebuilt/bin/Revolution.lnx "../tools/weak_stub_maker.lc" <./src/linux.stubs >./src/linuxstubs.cpp
6350

64-
include ../rules/archive.linux.makefile
51+
include Makefile.kernel-common

‎engine/Makefile.kernel-common‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
2+
CUSTOM_DEFINES=\
3+
LINUX \
4+
X11 TARGET_PLATFORM_LINUX TARGET_PLATFORM_POSIX \
5+
GTKTHEME \
6+
HAVE___THREAD \
7+
$(KERNEL_DEFINES)
8+
9+
CUSTOM_INCLUDES=\
10+
./src \
11+
$(KERNEL_INCLUDES)
12+
13+
CUSTOM_CCFLAGS=\
14+
-Wall -Wno-unused-variable -Wno-switch -Wno-non-virtual-dtor -fno-exceptions -fno-rtti \
15+
-fmessage-length=0 \
16+
$(KERNEL_CCFLAGS)
17+
18+
include ../rules/archive.linux.makefile

‎engine/Makefile.kernel-development‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
NAME=libkernel-development
2+
TYPE=archive
3+
4+
SOURCES= \
5+
ide.cpp internal_development.cpp lextable.cpp mode_development.cpp \
6+
startupstack.cpp deploy.cpp deploy_linux.cpp deploy_windows.cpp \
7+
deploy_macosx.cpp deploy_capsule.cpp deploy_sign.cpp deploy_file.cpp \
8+
deploy_dmg.cpp bsdiff_build.cpp encodederrors.cpp
9+
10+
KERNEL_DEFINES=\
11+
MODE_DEVELOPMENT
12+
13+
hashedstrings.cpp: src/lextable.cpp
14+
../prebuilt/bin/Revolution.lnx "./hash_strings.rev" "./src/lextable.cpp" "./src/hashedstrings.cpp" "../prebuilt/bin/perfect.lnx"
15+
16+
encodederrors.cpp: src/executionerrors.h src/parseerrors.h
17+
../prebuilt/bin/Revolution.lnx "./encode_errors.rev" "./src" "./src/encodederrors.cpp"
18+
19+
libkernel-development: hashedstrings.cpp
20+
21+
include Makefile.kernel-common

‎engine/Makefile.kernel-server‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
NAME=libkernel-server
2+
TYPE=archive
3+
4+
SOURCES=\
5+
aclip.cpp block.cpp button.cpp buttondraw.cpp card.cpp cardlst.cpp \
6+
cdata.cpp chunk.cpp cmds.cpp cmdsc.cpp cmdse.cpp cmdsf.cpp \
7+
cmdsm.cpp cmdsp.cpp cmdss.cpp constant.cpp control.cpp cpalette.cpp \
8+
date.cpp debug.cpp dispatch.cpp dllst.cpp \
9+
execpt.cpp express.cpp field.cpp fieldf.cpp fieldh.cpp fields.cpp \
10+
font.cpp funcs.cpp funcsm.cpp globals.cpp graphic.cpp group.cpp \
11+
handler.cpp hc.cpp hndlrlst.cpp ibmp.cpp idraw.cpp ifile.cpp \
12+
igif.cpp iimport.cpp ijpg.cpp image.cpp image_rep.cpp \
13+
image_rep_encoded.cpp image_rep_mutable.cpp image_rep_transformed.cpp \
14+
imagebitmap.cpp ipng.cpp \
15+
iquantization.cpp iquantize_new.cpp irle.cpp iutil.cpp \
16+
itransform.cpp keywords.cpp line.cpp literal.cpp magnify.cpp mcerror.cpp \
17+
mcio.cpp mcstring.cpp mctheme.cpp newobj.cpp \
18+
object.cpp objptr.cpp operator.cpp paragraf.cpp param.cpp \
19+
property.cpp pxmaplst.cpp pickle.cpp regex.cpp \
20+
scriptpt.cpp scrolbar.cpp scrollbardraw.cpp sellst.cpp stack.cpp stack2.cpp \
21+
stack3.cpp stackcache.cpp stacklst.cpp \
22+
statemnt.cpp styledtext.cpp tooltip.cpp \
23+
transfer.cpp uidc.cpp gradient.cpp edittool.cpp \
24+
undolst.cpp util.cpp variable.cpp vclip.cpp visual.cpp \
25+
eps.cpp mcssl.cpp \
26+
answer.cpp ask.cpp external.cpp player.cpp surface.cpp \
27+
combiners.cpp path.cpp metacontext.cpp \
28+
printer.cpp unicode.cpp rtf.cpp rtfsupport.cpp text.cpp pathgray.cpp \
29+
pathprocess.cpp \
30+
contextscalewrapper.cpp variablearray.cpp objectstream.cpp \
31+
menuparse.cpp parentscript.cpp securemode.cpp \
32+
bitmapeffect.cpp bitmapeffectblur.cpp md5.cpp sha1.cpp capsule.cpp \
33+
externalv0.cpp externalv1.cpp lextable.cpp \
34+
objectprops.cpp objectpropsets.cpp variablevalue.cpp mcutility.cpp notify.cpp customprinter.cpp \
35+
sysspec.cpp mode_server.cpp sysunxdate.cpp sysunxnetwork.cpp \
36+
srvmain.cpp srvspec.cpp srvsession.cpp srvstack.cpp srvflst.cpp srvposix.cpp srvdebug.cpp \
37+
srvscript.cpp srvcgi.cpp srvoutput.cpp srvmultipart.cpp \
38+
eventqueue.cpp encodederrors.cpp name.cpp redraw.cpp sysregion.cpp tilecache.cpp tilecachesw.cpp \
39+
fonttable.cpp fieldrtf.cpp fieldhtml.cpp fieldstyledtext.cpp paragrafattr.cpp
40+
41+
SOURCE_DIRS=
42+
43+
CUSTOM_OVERRIDE_DEFINES=1
44+
45+
CUSTOM_DEFINES=\
46+
_SERVER _LINUX_SERVER __LITTLE_ENDIAN__
47+
48+
CUSTOM_INCLUDES=\
49+
./src
50+
51+
CUSTOM_CCFLAGS=\
52+
-Wall -Wno-unused-variable -Wno-switch -Wno-non-virtual-dtor -fno-exceptions -fno-rtti -fno-strict-aliasing \
53+
-fmessage-length=0
54+
55+
linuxstubs.cpp: src/linux.stubs
56+
../tools/Revolution.lnx "../tools/weak_stub_maker.rev" <./src/linux.stubs >./src/linuxstubs.cpp
57+
58+
encodederrors.cpp: src/executionerrors.h src/parseerrors.h
59+
../tools/Revolution.lnx "./encode_errors.rev" "./src" "./src/encodederrors.cpp"
60+
61+
include ../rules/archive.linux.makefile

‎engine/Makefile.kernel-standalone‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
NAME=libkernel-standalone
2+
TYPE=archive
3+
4+
SOURCES= \
5+
lextable.cpp mode_standalone.cpp
6+
7+
KERNEL_DEFINES=\
8+
MODE_STANDALONE
9+
10+
include Makefile.kernel-common

‎engine/Makefile.server‎

Lines changed: 7 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,8 @@
1-
NAME=server
1+
NAME=server-community
22
TYPE=application
33

44
SOURCES=\
5-
aclip.cpp block.cpp button.cpp buttondraw.cpp card.cpp cardlst.cpp \
6-
cdata.cpp chunk.cpp cmds.cpp cmdsc.cpp cmdse.cpp cmdsf.cpp \
7-
cmdsm.cpp cmdsp.cpp cmdss.cpp constant.cpp control.cpp cpalette.cpp \
8-
date.cpp debug.cpp dispatch.cpp dllst.cpp \
9-
execpt.cpp express.cpp field.cpp fieldf.cpp fieldh.cpp fields.cpp \
10-
font.cpp funcs.cpp funcsm.cpp globals.cpp graphic.cpp group.cpp \
11-
handler.cpp hc.cpp hndlrlst.cpp ibmp.cpp idraw.cpp ifile.cpp \
12-
igif.cpp iimport.cpp ijpg.cpp image.cpp image_rep.cpp \
13-
image_rep_encoded.cpp image_rep_mutable.cpp image_rep_transformed.cpp \
14-
imagebitmap.cpp ipng.cpp \
15-
iquantization.cpp iquantize_new.cpp irle.cpp iutil.cpp \
16-
itransform.cpp keywords.cpp line.cpp literal.cpp magnify.cpp mcerror.cpp \
17-
mcio.cpp mcstring.cpp mctheme.cpp newobj.cpp \
18-
object.cpp objptr.cpp operator.cpp paragraf.cpp param.cpp \
19-
property.cpp pxmaplst.cpp pickle.cpp regex.cpp \
20-
scriptpt.cpp scrolbar.cpp scrollbardraw.cpp sellst.cpp stack.cpp stack2.cpp \
21-
stack3.cpp stackcache.cpp stacklst.cpp \
22-
stacksecurity.cpp \
23-
statemnt.cpp styledtext.cpp tooltip.cpp \
24-
transfer.cpp uidc.cpp gradient.cpp edittool.cpp \
25-
undolst.cpp util.cpp variable.cpp vclip.cpp visual.cpp \
26-
eps.cpp mcssl.cpp \
27-
answer.cpp ask.cpp external.cpp player.cpp surface.cpp \
28-
combiners.cpp path.cpp metacontext.cpp \
29-
printer.cpp unicode.cpp rtf.cpp rtfsupport.cpp text.cpp pathgray.cpp \
30-
pathprocess.cpp \
31-
contextscalewrapper.cpp variablearray.cpp objectstream.cpp \
32-
menuparse.cpp parentscript.cpp securemode.cpp \
33-
bitmapeffect.cpp bitmapeffectblur.cpp md5.cpp sha1.cpp capsule.cpp \
34-
externalv0.cpp externalv1.cpp lextable.cpp \
35-
objectprops.cpp objectpropsets.cpp variablevalue.cpp mcutility.cpp notify.cpp customprinter.cpp \
36-
sysspec.cpp mode_server.cpp sysunxdate.cpp sysunxnetwork.cpp \
37-
srvmain.cpp srvspec.cpp srvsession.cpp srvstack.cpp srvflst.cpp srvposix.cpp srvdebug.cpp \
38-
srvscript.cpp srvcgi.cpp srvoutput.cpp srvmultipart.cpp \
39-
eventqueue.cpp encodederrors.cpp name.cpp redraw.cpp sysregion.cpp tilecache.cpp tilecachesw.cpp \
40-
fonttable.cpp fieldrtf.cpp fieldhtml.cpp fieldstyledtext.cpp paragrafattr.cpp
5+
stacksecurity.cpp
416

427
SOURCE_DIRS=
438

@@ -47,24 +12,19 @@ CUSTOM_DEFINES=\
4712
_SERVER _LINUX_SERVER __LITTLE_ENDIAN__
4813

4914
CUSTOM_INCLUDES=\
50-
./src \
51-
$(HOME)/revlibs/prefix/include
15+
./src
5216

53-
CUSTOM_LIBS=pcre png jpeg z core gif
17+
CUSTOM_DEPS=libkernel-server.a
18+
19+
CUSTOM_LIBS=pcre png jpeg z core gif kernel-server
5420
CUSTOM_STATIC_LIBS=curl ssl crypto stdc++ rt
5521
CUSTOM_DYNAMIC_LIBS=dl m
5622

5723
CUSTOM_CCFLAGS=\
5824
-Wall -Wno-unused-variable -Wno-switch -Wno-non-virtual-dtor -fno-exceptions -fno-rtti -fno-strict-aliasing \
5925
-fmessage-length=0
6026

61-
CUSTOM_LDFLAGS=-L$(HOME)/revlibs/prefix/lib -export-dynamic -Wl,-x
62-
63-
linuxstubs.cpp: src/linux.stubs
64-
../tools/Revolution.lnx "../tools/weak_stub_maker.rev" <./src/linux.stubs >./src/linuxstubs.cpp
65-
66-
encodederrors.cpp: src/executionerrors.h src/parseerrors.h
67-
../tools/Revolution.lnx "./encode_errors.rev" "./src" "./src/encodederrors.cpp"
27+
CUSTOM_LDFLAGS=-export-dynamic -Wl,-x
6828

6929
include ../rules/application.linux.makefile
7030

0 commit comments

Comments
 (0)