Skip to content

Commit 4f5c23a

Browse files
committed
Sort Makefile
1 parent 5f18767 commit 4f5c23a

File tree

1 file changed

+44
-39
lines changed

1 file changed

+44
-39
lines changed

src/main/c/Makefile

Lines changed: 44 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -31,25 +31,30 @@ EXTCONF_DEPS := $(BASIC_EXTCONF_DEPS) sulongmock/sulongmock.o cext/ruby.o cext/r
3131

3232
IF_EXTCONF_FAIL := ( echo "`pwd`/extconf.rb failed:" 1>&2 && cat mkmf.log && false )
3333

34-
all: cext/ruby.su openssl/openssl.su zlib/zlib.su \
35-
psych/psych.su syslog/syslog.su nkf/nkf.su \
36-
etc/etc.su rbconfig-sizeof/sizeof.su
34+
all: cext/ruby.su \
35+
etc/etc.su \
36+
nkf/nkf.su \
37+
openssl/openssl.su \
38+
psych/psych.su \
39+
rbconfig-sizeof/sizeof.su \
40+
syslog/syslog.su \
41+
zlib/zlib.su
3742

3843
clean: clean_cexts clean_truffleposix
3944

4045
clean_truffleposix:
4146
rm -f $(TRUFFLE_POSIX) truffleposix/*.o
4247

4348
clean_cexts:
44-
rm -f sulongmock/sulongmock.o
4549
rm -f cext/Makefile cext/*.bc cext/ruby.o cext/ruby.su
50+
rm -f etc/Makefile etc/*.bc etc/etc.su etc/constdefs.h
51+
rm -f nkf/Makefile nkf/*.bc nkf/nkf.su
4652
rm -f openssl/Makefile openssl/*.bc openssl/openssl.su
47-
rm -f zlib/Makefile zlib/*.bc zlib/zlib.su
4853
rm -f psych/Makefile psych/*.bc psych/yaml/*.bc psych/psych.su
49-
rm -f syslog/Makefile syslog/*.bc syslog/syslog.su
50-
rm -f nkf/Makefile nkf/*.bc nkf/nkf.su
51-
rm -f etc/Makefile etc/*.bc etc/etc.su etc/constdefs.h
5254
rm -f rbconfig-sizeof/Makefile rbconfig-sizeof/*.bc rbconfig-sizeof/sizeof.su
55+
rm -f sulongmock/sulongmock.o
56+
rm -f syslog/Makefile syslog/*.bc syslog/syslog.su
57+
rm -f zlib/Makefile zlib/*.bc zlib/zlib.su
5358

5459
# truffleposix
5560
$(TRUFFLE_POSIX): truffleposix/Makefile truffleposix/truffleposix.c
@@ -73,26 +78,17 @@ cext/Makefile: cext/extconf.rb $(BASIC_EXTCONF_DEPS)
7378
cext/ruby.su: cext/Makefile cext/*.c
7479
cd cext && $(MAKE)
7580

76-
# openssl.su
77-
openssl/Makefile: openssl/extconf.rb $(EXTCONF_DEPS)
78-
cd openssl && $(RUBY) extconf.rb || $(IF_EXTCONF_FAIL)
79-
80-
openssl/openssl.su: openssl/Makefile openssl/*.c openssl/*.h
81-
cd openssl && $(MAKE)
82-
83-
# zlib.su
84-
zlib/Makefile: zlib/extconf.rb $(EXTCONF_DEPS)
85-
cd zlib && $(RUBY) extconf.rb || $(IF_EXTCONF_FAIL)
81+
# etc.su
82+
etc/Makefile: etc/extconf.rb $(EXTCONF_DEPS)
83+
cd etc && $(RUBY) extconf.rb || $(IF_EXTCONF_FAIL)
8684

87-
zlib/zlib.su: zlib/Makefile zlib/zlib.c
88-
cd zlib && $(MAKE)
85+
etc/etc.su: etc/Makefile etc/etc.c
86+
cd etc && $(MAKE)
8987

90-
# syslog.su
91-
syslog/Makefile: syslog/extconf.rb $(EXTCONF_DEPS)
92-
cd syslog && $(RUBY) extconf.rb || $(IF_EXTCONF_FAIL)
88+
etc/etc.c: etc/constdefs.h
9389

94-
syslog/syslog.su: syslog/Makefile syslog/syslog.c
95-
cd syslog && $(MAKE)
90+
etc/constdefs.h: etc/mkconstants.rb
91+
$(RUBY) $< -o $@
9692

9793
# nkf.su
9894
nkf/Makefile: nkf/extconf.rb $(EXTCONF_DEPS)
@@ -101,17 +97,20 @@ nkf/Makefile: nkf/extconf.rb $(EXTCONF_DEPS)
10197
nkf/nkf.su: nkf/Makefile nkf/nkf.c nkf/nkf-utf8/*.c nkf/nkf-utf8/*.h
10298
cd nkf && $(MAKE)
10399

104-
# etc.su
105-
etc/Makefile: etc/extconf.rb $(EXTCONF_DEPS)
106-
cd etc && $(RUBY) extconf.rb || $(IF_EXTCONF_FAIL)
100+
# openssl.su
101+
openssl/Makefile: openssl/extconf.rb $(EXTCONF_DEPS)
102+
cd openssl && $(RUBY) extconf.rb || $(IF_EXTCONF_FAIL)
107103

108-
etc/etc.su: etc/Makefile etc/etc.c
109-
cd etc && $(MAKE)
104+
openssl/openssl.su: openssl/Makefile openssl/*.c openssl/*.h
105+
cd openssl && $(MAKE)
110106

111-
etc/etc.c: etc/constdefs.h
107+
# psych.su
108+
# Always use the bundled libyaml, as we want it as bitcode and avoid extra handles
109+
psych/Makefile: psych/extconf.rb $(EXTCONF_DEPS)
110+
cd psych && $(RUBY) extconf.rb --enable-bundled-libyaml || $(IF_EXTCONF_FAIL)
112111

113-
etc/constdefs.h: etc/mkconstants.rb
114-
$(RUBY) $< -o $@
112+
psych/psych.su: psych/Makefile psych/*.c psych/*.h psych/yaml/*.c psych/yaml/*.h
113+
cd psych && $(MAKE)
115114

116115
# rbconfig/sizeof.su
117116
rbconfig-sizeof/Makefile: rbconfig-sizeof/extconf.rb $(EXTCONF_DEPS)
@@ -120,10 +119,16 @@ rbconfig-sizeof/Makefile: rbconfig-sizeof/extconf.rb $(EXTCONF_DEPS)
120119
rbconfig-sizeof/sizeof.su: rbconfig-sizeof/Makefile rbconfig-sizeof/sizes.c
121120
cd rbconfig-sizeof && $(MAKE)
122121

123-
# psych.su
124-
# Always use the bundled libyaml, as we want it as bitcode and avoid extra handles
125-
psych/Makefile: psych/extconf.rb $(EXTCONF_DEPS)
126-
cd psych && $(RUBY) extconf.rb --enable-bundled-libyaml || $(IF_EXTCONF_FAIL)
122+
# syslog.su
123+
syslog/Makefile: syslog/extconf.rb $(EXTCONF_DEPS)
124+
cd syslog && $(RUBY) extconf.rb || $(IF_EXTCONF_FAIL)
127125

128-
psych/psych.su: psych/Makefile psych/*.c psych/*.h psych/yaml/*.c psych/yaml/*.h
129-
cd psych && $(MAKE)
126+
syslog/syslog.su: syslog/Makefile syslog/syslog.c
127+
cd syslog && $(MAKE)
128+
129+
# zlib.su
130+
zlib/Makefile: zlib/extconf.rb $(EXTCONF_DEPS)
131+
cd zlib && $(RUBY) extconf.rb || $(IF_EXTCONF_FAIL)
132+
133+
zlib/zlib.su: zlib/Makefile zlib/zlib.c
134+
cd zlib && $(MAKE)

0 commit comments

Comments
 (0)