]>
Commit | Line | Data |
---|---|---|
8afbe111 JB |
1 | --- gdal-1.5.1/swig/ruby/RubyMakefile.mk.orig 2006-12-21 03:49:08.000000000 +0100 |
2 | +++ gdal-1.5.1/swig/ruby/RubyMakefile.mk 2008-06-06 21:48:10.535282314 +0200 | |
3 | @@ -17,7 +17,7 @@ | |
4 | ||
5 | include $(GDAL_ROOT)/GDALmake.opt | |
6 | ||
7 | -RUBY_MODULES = gdal.so ogr.so gdalconst.so osr.so | |
8 | +RUBY_MODULES = gdal.la ogr.la gdalconst.la osr.la | |
9 | RUBY_INCLUDE_DIR := $(shell ruby -rrbconfig -e "puts Config::CONFIG['archdir']") | |
10 | RUBY_LIB_DIR := $(shell ruby -rrbconfig -e "puts Config::CONFIG['libdir']") | |
11 | RUBY_SO_NAME := $(shell ruby -rrbconfig -e "puts Config::CONFIG['RUBY_SO_NAME']") | |
12 | @@ -25,7 +25,7 @@ | |
13 | INSTALL_DIR := $(RUBY_EXTENSIONS_DIR)/gdal | |
14 | ||
15 | RUBY_INCLUDE = -I$(RUBY_INCLUDE_DIR) | |
16 | -LDFLAGS += -shared -L$(RUBY_LIB_DIR) | |
17 | +LDFLAGS += -shared -module -avoid-version -rpath $(INSTALL_DIR) -L$(RUBY_LIB_DIR) | |
18 | RUBY_LIB := -l$(RUBY_SO_NAME) | |
19 | ||
20 | build: $(RUBY_MODULES) | |
21 | @@ -44,14 +44,14 @@ | |
22 | install: $(INSTALL_DIR) | |
c332d2a9 JB |
23 | $(INSTALL) $(RUBY_MODULES) $(DESTDIR)$(INSTALL_DIR) |
24 | ||
8afbe111 | 25 | -$(RUBY_MODULES): %.so: %_wrap.o |
c332d2a9 | 26 | - $(LD) $(LDFLAGS) $(LIBS) $(GDAL_SLIB_LINK) $(RUBY_LIB) $< -o $@ |
8afbe111 | 27 | +$(RUBY_MODULES): %.la: %_wrap.lo |
c332d2a9 JB |
28 | + $(LD) $(GDAL_SLIB_LINK) $(LDFLAGS) $(LIBS) $(RUBY_LIB) $< -o $@ |
29 | ||
8afbe111 JB |
30 | -%.o: %.cpp |
31 | +%.lo: %.cpp | |
32 | $(CXX) $(CFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE) -c $< | |
c332d2a9 | 33 | |
8afbe111 JB |
34 | -%.o: %.cxx |
35 | +%.lo: %.cxx | |
36 | $(CXX) $(CFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE) -c $< | |
c332d2a9 | 37 | |
8afbe111 JB |
38 | -%.o: %.c |
39 | +%.lo: %.c | |
40 | $(CC) $(CFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE) -c $< |