View | Details | Raw Unified
Collapse All | Expand All

(-) Makefile.gnu (-13 / +12 lines)
 Lines 4-12    Link Here 
include fipMakefile.srcs
include fipMakefile.srcs
# General configuration variables:
# General configuration variables:
CC = gcc
#CC = gcc
CXX = g++
#CXX = g++
AR = ar
#AR = ar
INCDIR = /usr/include
INCDIR = /usr/include
INSTALLDIR = /usr/lib
INSTALLDIR = /usr/lib
 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 := $(CFLAGS) $(COMPILERFLAGS) -fPIC -DPIC $(INCLUDE)
CXXFLAGS = $(COMPILERFLAGS) -Wno-ctor-dtor-privacy $(INCLUDE)
CXXFLAGS := $(CXXFLAGS) $(COMPILERFLAGS) -fPIC -DPIC -Wno-ctor-dtor-privacy $(INCLUDE)
TARGET  = freeimageplus
TARGET  = freeimageplus
STATICLIB = lib$(TARGET).a
STATICLIB = lib$(TARGET).a
 Lines 56-62    Link Here 
	$(AR) r $@ $(MODULES)
	$(AR) r $@ $(MODULES)
$(SHAREDLIB): $(MODULES)
$(SHAREDLIB): $(MODULES)
	$(CC) -s -shared -Wl,-soname,$(VERLIBNAME) -o $@ $(MODULES) $(LIBRARIES)
	$(CC) $(LDFLAGS) -fPIC -s -shared -Wl,-soname,$(VERLIBNAME) -o $@ $(MODULES) $(LIBRARIES)
install:
install:
	install -m 644 -o root -g root $(HEADER) $(INCDIR)
	install -m 644 -o root -g root $(HEADER) $(INCDIR)
 Lines 65-71    Link Here 
	install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
	install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
	ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
	ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
	ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)
	ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)
	ldconfig
clean:
clean:
	rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)
	rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)
 Lines 4-12    Link Here 
include Makefile.srcs
include Makefile.srcs
# General configuration variables:
# General configuration variables:
CC = gcc
#CC = gcc
CXX = g++
#CXX = g++
AR = ar
#AR = ar
INCDIR = /usr/include
INCDIR = /usr/include
INSTALLDIR = /usr/lib
INSTALLDIR = /usr/lib
 Lines 14-26    Link Here 
# Converts cr/lf to just lf
# Converts cr/lf to just lf
DOS2UNIX = dos2unix
DOS2UNIX = dos2unix
COMPILERFLAGS = -O3 -fPIC
COMPILERFLAGS = -fPIC -DPIC
LIBRARIES = -lstdc++
LIBRARIES = -lstdc++
MODULES = $(SRCS:.c=.o)
MODULES = $(SRCS:.c=.o)
MODULES := $(MODULES:.cpp=.o)
MODULES := $(MODULES:.cpp=.o)
CFLAGS = $(COMPILERFLAGS) $(INCLUDE)
CFLAGS := $(CFLAGS) $(COMPILERFLAGS) $(INCLUDE)
CXXFLAGS = $(COMPILERFLAGS)  -Wno-ctor-dtor-privacy $(INCLUDE)
CXXFLAGS := $(CXXFLAGS) $(COMPILERFLAGS) -Wno-ctor-dtor-privacy $(INCLUDE)
TARGET  = freeimage
TARGET  = freeimage
STATICLIB = lib$(TARGET).a
STATICLIB = lib$(TARGET).a