File tree Expand file tree Collapse file tree 2 files changed +11
-2
lines changed Expand file tree Collapse file tree 2 files changed +11
-2
lines changed Original file line number Diff line number Diff line change @@ -2,8 +2,12 @@ $(TARGET_SO): $(LIBYAML)
2
2
3
3
libyaml $(LIBYAML):
4
4
cd libyaml && $(MAKE)
5
+ $(AR) $(ARFLAGS) $(LIBYAML) $(LIBYAML_OBJDIR)/*.$(OBJEXT)
6
+ $(RANLIB) $(LIBYAML)
7
+
5
8
clean-so::
6
9
-cd libyaml && $(MAKE) clean
10
+
7
11
distclean-so::
8
12
-cd libyaml && $(MAKE) distclean
9
13
-$(Q)$(RMDIRS) libyaml/* libyaml
Original file line number Diff line number Diff line change 39
39
puts ( "Configuring libyaml source in #{ yaml_source . quote } " )
40
40
yaml = "libyaml"
41
41
Dir . mkdir ( yaml ) unless File . directory? ( yaml )
42
+ shared = $enable_shared || !$static
42
43
unless system ( yaml_configure , "-q" ,
43
- "--enable-#{ $enable_shared || !$static ? 'shared' : 'static' } " ,
44
+ "--enable-#{ shared ? 'shared' : 'static' } " ,
44
45
"--host=#{ RbConfig ::CONFIG [ 'host' ] . sub ( /-unknown-/ , '-' ) } " ,
45
46
*( [ "CFLAGS=-w" ] if RbConfig ::CONFIG [ "GCC" ] == "yes" ) ,
46
47
chdir : yaml )
50
51
inc = yaml_source . start_with? ( "#$srcdir/" ) ? "$(srcdir)#{ yaml_source [ $srcdir. size ..-1 ] } " : yaml_source
51
52
$INCFLAGS << " -I#{ yaml } /include -I#{ inc } /include"
52
53
Logging . message ( "INCLFAG=#$INCLFAG\n " )
53
- libyaml = "#{ yaml } /src/.libs/libyaml.#$LIBEXT"
54
+ libyaml = "libyaml.#$LIBEXT"
55
+ $cleanfiles << libyaml
54
56
$LOCAL_LIBS. prepend ( "$(LIBYAML) " )
55
57
end
56
58
57
59
create_makefile 'psych' do |mk |
58
60
mk << "LIBYAML = #{ libyaml } " . strip << "\n "
61
+ mk << "LIBYAML_OBJDIR = libyaml/src#{ shared ? '/.libs' : '' } \n "
62
+ mk << "OBJEXT = #$OBJEXT"
63
+ mk << "RANLIB = #{ config_string ( 'RANLIB' ) || config_string ( 'NULLCMD' ) } \n "
59
64
end
60
65
61
66
# :startdoc:
You can’t perform that action at this time.
0 commit comments