|
338
|
1 |
--- solaris/Makefile.orig 2007-07-13 16:19:17.958665806 +0700
|
|
|
2 |
+++ solaris/Makefile 2007-07-13 16:19:43.107883802 +0700
|
|
|
3 |
@@ -10,18 +10,11 @@
|
|
|
4 |
#
|
|
|
5 |
|
|
|
6 |
# Paths
|
|
|
7 |
-# BeOS wants the libs and headers in /boot/home/config
|
|
|
8 |
-ifeq (BeOS,$(shell uname -s))
|
|
|
9 |
-prefix=/boot/home/config
|
|
|
10 |
-else
|
|
|
11 |
-prefix=/usr/local
|
|
|
12 |
-endif
|
|
|
13 |
+prefix=$(PREFIX)
|
|
|
14 |
libdir=$(prefix)/lib
|
|
|
15 |
includedir=$(prefix)/include/ebml
|
|
|
16 |
|
|
|
17 |
# Programs
|
|
|
18 |
-CXX=g++
|
|
|
19 |
-LD=$(CXX)
|
|
|
20 |
AR = ar rcvu
|
|
|
21 |
RANLIB = ranlib
|
|
|
22 |
INSTALL = install
|
|
|
23 |
@@ -65,7 +58,7 @@
|
|
|
24 |
objects_so:=$(patsubst %$(EXTENSION),%.lo,$(sources))
|
|
|
25 |
|
|
|
26 |
WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -Wshadow
|
|
|
27 |
-COMPILEFLAGS=$(WARNINGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS) $(INCLUDE)
|
|
|
28 |
+COMPILEFLAGS=$(CXXFLAGS) $(CPPFLAGS) $(INCLUDE)
|
|
|
29 |
DEPENDFLAGS = $(CXXFLAGS) $(INCLUDE)
|
|
|
30 |
|
|
|
31 |
ifeq (Darwin,$(shell uname -s))
|
|
|
32 |
@@ -87,14 +80,14 @@
|
|
|
33 |
$(CXX) -c $(COMPILEFLAGS) -o $@ $<
|
|
|
34 |
|
|
|
35 |
%.lo: %$(EXTENSION)
|
|
|
36 |
- $(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
|
|
|
37 |
+ $(CXX) -c $(COMPILEFLAGS) -KPIC -o $@ $<
|
|
|
38 |
|
|
|
39 |
$(LIBRARY): $(objects)
|
|
|
40 |
$(AR) $@ $(objects)
|
|
|
41 |
$(RANLIB) $@
|
|
|
42 |
|
|
|
43 |
$(LIBRARY_SO): $(objects_so)
|
|
|
44 |
- $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so)
|
|
|
45 |
+ $(CXX) -G -h $(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so)
|
|
|
46 |
rm -f $(LIBRARY_SO)
|
|
|
47 |
ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO)
|
|
|
48 |
|
|
|
49 |
@@ -125,23 +118,23 @@
|
|
|
50 |
endif
|
|
|
51 |
|
|
|
52 |
install_headers:
|
|
|
53 |
- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)
|
|
|
54 |
+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)/$(includedir)
|
|
|
55 |
for i in $(INCLUDE_DIR)/*.h; do \
|
|
|
56 |
- $(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \
|
|
|
57 |
+ $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)/$(includedir) ; \
|
|
|
58 |
done
|
|
|
59 |
- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)/c
|
|
|
60 |
+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)/$(includedir)/c
|
|
|
61 |
for i in $(INCLUDE_DIR)/c/*.h; do \
|
|
|
62 |
- $(INSTALL) $(INSTALL_OPTS) $$i $(includedir)/c ; \
|
|
|
63 |
+ $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)/$(includedir)/c ; \
|
|
|
64 |
done
|
|
|
65 |
|
|
|
66 |
install_staticlib: $(LIBRARY)
|
|
|
67 |
- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
|
|
|
68 |
- $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir)
|
|
|
69 |
+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)/$(libdir)
|
|
|
70 |
+ $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(DESTDIR)/$(libdir)
|
|
|
71 |
|
|
|
72 |
install_sharedlib: $(LIBRARY_SO)
|
|
|
73 |
- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
|
|
|
74 |
- $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir)
|
|
|
75 |
- ln -s $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO)
|
|
|
76 |
+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)/$(libdir)
|
|
|
77 |
+ $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(DESTDIR)/$(libdir)
|
|
|
78 |
+ ( cd $(DESTDIR)/$(libdir) ; ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO) )
|
|
|
79 |
|
|
|
80 |
|
|
|
81 |
ifneq ($(wildcard .depend),)
|