Line
Link Here
|
0 |
-- Makefile |
0 |
++ Makefile |
Lines 14-21
Link Here
|
14 |
MAKEFILE = solaris |
14 |
MAKEFILE = solaris |
15 |
endif |
15 |
endif |
16 |
|
16 |
|
|
|
17 |
FLAGS = -Wall -fPIC |
17 |
default: |
18 |
default: |
18 |
$(MAKE) -f Makefile.$(MAKEFILE) |
19 |
$(MAKE) CC="$(CC)" CXX="$(CXX)" AR="$(AR)" COMPILERFLAGS="$(FLAGS)" -f Makefile.gnu |
|
|
20 |
$(MAKE) CC="$(CC)" CXX="$(CXX)" AR="$(AR)" COMPILERFLAGS="$(FLAGS)" -f Makefile.fip |
19 |
|
21 |
|
20 |
all: |
22 |
all: |
21 |
$(MAKE) -f Makefile.$(MAKEFILE) all |
23 |
$(MAKE) -f Makefile.$(MAKEFILE) all |
Lines 24-30
Link Here
|
24 |
$(MAKE) -f Makefile.$(MAKEFILE) dist |
27 |
$(MAKE) -f Makefile.$(MAKEFILE) dist |
25 |
|
28 |
|
26 |
install: |
29 |
install: |
27 |
$(MAKE) -f Makefile.$(MAKEFILE) install |
30 |
$(MAKE) -f Makefile.gnu install |
|
|
31 |
$(MAKE) -f Makefile.fip install |
28 |
|
32 |
|
29 |
clean: |
33 |
clean: |
30 |
$(MAKE) -f Makefile.$(MAKEFILE) clean |
34 |
$(MAKE) -f Makefile.$(MAKEFILE) clean |
31 |
-- Makefile.fip |
35 |
++ Makefile.fip |
Lines 19-26
Link Here
|
19 |
|
19 |
|
20 |
MODULES = $(SRCS:.c=.o) |
20 |
MODULES = $(SRCS:.c=.o) |
21 |
MODULES := $(MODULES:.cpp=.o) |
21 |
MODULES := $(MODULES:.cpp=.o) |
22 |
CFLAGS = $(COMPILERFLAGS) $(INCLUDE) |
22 |
CFLAGS += $(COMPILERFLAGS) $(INCLUDE) |
23 |
CXXFLAGS = $(COMPILERFLAGS) -Wno-ctor-dtor-privacy $(INCLUDE) |
23 |
CXXFLAGS += $(COMPILERFLAGS) -Wno-ctor-dtor-privacy $(INCLUDE) |
24 |
|
24 |
|
25 |
TARGET = freeimageplus |
25 |
TARGET = freeimageplus |
26 |
STATICLIB = lib$(TARGET).a |
26 |
STATICLIB = lib$(TARGET).a |
Lines 56-71
Link Here
|
56 |
$(AR) r $@ $(MODULES) |
56 |
$(AR) r $@ $(MODULES) |
57 |
|
57 |
|
58 |
$(SHAREDLIB): $(MODULES) |
58 |
$(SHAREDLIB): $(MODULES) |
59 |
$(CC) -s -shared -Wl,-soname,$(VERLIBNAME) -o $@ $(MODULES) $(LIBRARIES) |
59 |
$(CC) $(LDFLAGS) -shared -Wl,-soname,$(VERLIBNAME) -o $@ $(MODULES) $(LIBRARIES) |
60 |
|
60 |
|
61 |
install: |
61 |
install: |
62 |
install -m 644 -o root -g root $(HEADER) $(INCDIR) |
62 |
install -m 644 $(HEADER) $(DESTDIR)/$(INCDIR) |
63 |
install -m 644 -o root -g root $(HEADERFIP) $(INCDIR) |
63 |
install -m 644 $(HEADERFIP) $(DESTDIR)/$(INCDIR) |
64 |
install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR) |
64 |
install -m 644 $(STATICLIB) $(DESTDIR)/$(LIBDIR) |
65 |
install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR) |
65 |
install -m 755 $(SHAREDLIB) $(DESTDIR)/$(LIBDIR) |
66 |
ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME) |
66 |
ln -sf $(SHAREDLIB) $(DESTDIR)/$(LIBDIR)/$(VERLIBNAME) |
67 |
ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME) |
67 |
ln -sf $(VERLIBNAME) $(DESTDIR)/$(LIBDIR)/$(LIBNAME) |
68 |
ldconfig |
|
|
69 |
|
68 |
|
70 |
clean: |
69 |
clean: |
71 |
rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME) |
70 |
rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME) |
72 |
-- Makefile.gnu |
71 |
++ Makefile.gnu |
Lines 19-26
Link Here
|
19 |
|
19 |
|
20 |
MODULES = $(SRCS:.c=.o) |
20 |
MODULES = $(SRCS:.c=.o) |
21 |
MODULES := $(MODULES:.cpp=.o) |
21 |
MODULES := $(MODULES:.cpp=.o) |
22 |
CFLAGS = $(COMPILERFLAGS) $(INCLUDE) |
22 |
CFLAGS += $(COMPILERFLAGS) $(INCLUDE) |
23 |
CXXFLAGS = $(COMPILERFLAGS) -Wno-ctor-dtor-privacy $(INCLUDE) |
23 |
CXXFLAGS += $(COMPILERFLAGS) -Wno-ctor-dtor-privacy $(INCLUDE) |
24 |
|
24 |
|
25 |
TARGET = freeimage |
25 |
TARGET = freeimage |
26 |
STATICLIB = lib$(TARGET).a |
26 |
STATICLIB = lib$(TARGET).a |
Lines 55-69
Link Here
|
55 |
$(AR) r $@ $(MODULES) |
55 |
$(AR) r $@ $(MODULES) |
56 |
|
56 |
|
57 |
$(SHAREDLIB): $(MODULES) |
57 |
$(SHAREDLIB): $(MODULES) |
58 |
$(CC) -s -shared -Wl,-soname,$(VERLIBNAME) -o $@ $(MODULES) $(LIBRARIES) |
58 |
$(CC) $(LDFLAGS) -shared -Wl,-soname,$(VERLIBNAME) -o $@ $(MODULES) $(LIBRARIES) |
59 |
|
59 |
|
60 |
install: |
60 |
install: |
61 |
install -m 644 -o root -g root $(HEADER) $(INCDIR) |
61 |
install -d $(DESTDIR)/$(INCDIR) $(DESTDIR)/$(LIBDIR) |
62 |
install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR) |
62 |
install -m 644 $(HEADER) $(DESTDIR)/$(INCDIR) |
63 |
install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR) |
63 |
install -m 644 $(STATICLIB) $(DESTDIR)/$(LIBDIR) |
64 |
ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME) |
64 |
install -m 755 $(SHAREDLIB) $(DESTDIR)/$(LIBDIR) |
65 |
ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME) |
65 |
ln -sf $(SHAREDLIB) $(DESTDIR)/$(LIBDIR)/$(VERLIBNAME) |
66 |
ldconfig |
66 |
ln -sf $(VERLIBNAME) $(DESTDIR)/$(LIBDIR)/$(LIBNAME) |
67 |
|
67 |
|
68 |
clean: |
68 |
clean: |
69 |
rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME) |
69 |
rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME) |