View | Details | Raw Unified
Collapse All | Expand All

(-) file_not_specified_in_diff (-21 / +23 lines)
 Lines 14-21    Link Here 
    MAKEFILE = solaris
    MAKEFILE = solaris
endif
endif
FLAGS = -Wall -fPIC
default:
default:
	$(MAKE) -f Makefile.$(MAKEFILE) 
	$(MAKE) CC="$(CC)" CXX="$(CXX)" AR="$(AR)" COMPILERFLAGS="$(FLAGS)" -f Makefile.gnu
	$(MAKE) CC="$(CC)" CXX="$(CXX)" AR="$(AR)" COMPILERFLAGS="$(FLAGS)" -f Makefile.fip
all:
all:
	$(MAKE) -f Makefile.$(MAKEFILE) all 
	$(MAKE) -f Makefile.$(MAKEFILE) all 
 Lines 24-30    Link Here 
	$(MAKE) -f Makefile.$(MAKEFILE) dist 
	$(MAKE) -f Makefile.$(MAKEFILE) dist 
install:
install:
	$(MAKE) -f Makefile.$(MAKEFILE) install 
	$(MAKE) -f Makefile.gnu install
	$(MAKE) -f Makefile.fip install
clean:
clean:
	$(MAKE) -f Makefile.$(MAKEFILE) clean 
	$(MAKE) -f Makefile.$(MAKEFILE) clean 
 Lines 19-26    Link Here 
MODULES = $(SRCS:.c=.o)
MODULES = $(SRCS:.c=.o)
MODULES := $(MODULES:.cpp=.o)
MODULES := $(MODULES:.cpp=.o)
CFLAGS = $(COMPILERFLAGS) $(INCLUDE)
CFLAGS += $(COMPILERFLAGS) $(INCLUDE)
CXXFLAGS = $(COMPILERFLAGS) -Wno-ctor-dtor-privacy $(INCLUDE)
CXXFLAGS += $(COMPILERFLAGS) -Wno-ctor-dtor-privacy $(INCLUDE)
TARGET  = freeimageplus
TARGET  = freeimageplus
STATICLIB = lib$(TARGET).a
STATICLIB = lib$(TARGET).a
 Lines 56-71    Link Here 
	$(AR) r $@ $(MODULES)
	$(AR) r $@ $(MODULES)
$(SHAREDLIB): $(MODULES)
$(SHAREDLIB): $(MODULES)
	$(CC) -s -shared -Wl,-soname,$(VERLIBNAME) -o $@ $(MODULES) $(LIBRARIES)
	$(CC) $(LDFLAGS) -shared -Wl,-soname,$(VERLIBNAME) -o $@ $(MODULES) $(LIBRARIES)
install:
install:
	install -m 644 -o root -g root $(HEADER) $(INCDIR)
	install -m 644 $(HEADER) $(DESTDIR)/$(INCDIR)
	install -m 644 -o root -g root $(HEADERFIP) $(INCDIR)
	install -m 644 $(HEADERFIP) $(DESTDIR)/$(INCDIR)
	install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
	install -m 644 $(STATICLIB) $(DESTDIR)/$(LIBDIR)
	install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
	install -m 755 $(SHAREDLIB) $(DESTDIR)/$(LIBDIR)
	ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
	ln -sf $(SHAREDLIB) $(DESTDIR)/$(LIBDIR)/$(VERLIBNAME)
	ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)
	ln -sf $(VERLIBNAME) $(DESTDIR)/$(LIBDIR)/$(LIBNAME)
	ldconfig
clean:
clean:
	rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)
	rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)
 Lines 19-26    Link Here 
MODULES = $(SRCS:.c=.o)
MODULES = $(SRCS:.c=.o)
MODULES := $(MODULES:.cpp=.o)
MODULES := $(MODULES:.cpp=.o)
CFLAGS = $(COMPILERFLAGS) $(INCLUDE)
CFLAGS += $(COMPILERFLAGS) $(INCLUDE)
CXXFLAGS = $(COMPILERFLAGS)  -Wno-ctor-dtor-privacy $(INCLUDE)
CXXFLAGS += $(COMPILERFLAGS) -Wno-ctor-dtor-privacy $(INCLUDE)
TARGET  = freeimage
TARGET  = freeimage
STATICLIB = lib$(TARGET).a
STATICLIB = lib$(TARGET).a
 Lines 55-69    Link Here 
	$(AR) r $@ $(MODULES)
	$(AR) r $@ $(MODULES)
$(SHAREDLIB): $(MODULES)
$(SHAREDLIB): $(MODULES)
	$(CC) -s -shared -Wl,-soname,$(VERLIBNAME) -o $@ $(MODULES) $(LIBRARIES)
	$(CC) $(LDFLAGS) -shared -Wl,-soname,$(VERLIBNAME) -o $@ $(MODULES) $(LIBRARIES)
install:
install:
	install -m 644 -o root -g root $(HEADER) $(INCDIR)
	install -d $(DESTDIR)/$(INCDIR) $(DESTDIR)/$(LIBDIR)
	install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
	install -m 644 $(HEADER) $(DESTDIR)/$(INCDIR)
	install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
	install -m 644 $(STATICLIB) $(DESTDIR)/$(LIBDIR)
	ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
	install -m 755 $(SHAREDLIB) $(DESTDIR)/$(LIBDIR)
	ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)	
	ln -sf $(SHAREDLIB) $(DESTDIR)/$(LIBDIR)/$(VERLIBNAME)
	ldconfig
	ln -sf $(VERLIBNAME) $(DESTDIR)/$(LIBDIR)/$(LIBNAME)
clean:
clean:
	rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)
	rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)