Attachment #180977 for bug #252766




include fipMakefile.srcs

# General configuration variables:
DESTDIR ?= /
INCDIR ?= $(DESTDIR)/usr/include
INSTALLDIR ?= $(DESTDIR)/usr/lib

INCDIR = /usr/include
INSTALLDIR = /usr/lib

# Converts cr/lf to just lf
DOS2UNIX = dos2unix

COMPILERFLAGS = -O3 -fexceptions -fvisibility=hidden
LIBRARIES = -lstdc++

MODULES = $(SRCS:.c=.o)
MODULES := $(MODULES:.cpp=.o)
CFLAGS ?= -O3 -fexceptions -fvisibility=hidden
CFLAGS += $(INCLUDE)
CXXFLAGS ?= -O3 -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy
CXXFLAGS += $(INCLUDE)

ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64)
	CFLAGS += -fPIC
	CXXFLAGS += -fPIC
endif

TARGET  = freeimageplus
STATICLIB = lib$(TARGET).a

	$(AR) r $@ $(MODULES)

$(SHAREDLIB): $(MODULES)
	$(CC) -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES)

install:
	install -d $(INCDIR) $(INSTALLDIR)
	install -m 644 -o root -g root $(HEADER) $(INCDIR)
	install -m 644 -o root -g root $(HEADERFIP) $(INCDIR)
	install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
	install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
	ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
	ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)
	ldconfig

clean:
	rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)




include Makefile.srcs

# General configuration variables:
DESTDIR ?= /
INCDIR ?= $(DESTDIR)/usr/include
INSTALLDIR ?= $(DESTDIR)/usr/lib

INCDIR = /usr/include
INSTALLDIR = /usr/lib

# Converts cr/lf to just lf
DOS2UNIX = dos2unix

COMPILERFLAGS = -O3 -fPIC -fexceptions -fvisibility=hidden
LIBRARIES = -lstdc++

MODULES = $(SRCS:.c=.o)
MODULES := $(MODULES:.cpp=.o)
CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden
CFLAGS += $(INCLUDE)
CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy
CXXFLAGS += $(INCLUDE)

ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64)
	CFLAGS += -fPIC
	CXXFLAGS += -fPIC
endif

TARGET  = freeimage
STATICLIB = lib$(TARGET).a

	$(AR) r $@ $(MODULES)

$(SHAREDLIB): $(MODULES)
	$(CC) -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES)

install:
	install -d $(INCDIR) $(INSTALLDIR)
	install -m 644 -o root -g root $(HEADER) $(INCDIR)
	install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
	install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
	ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
	ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)	
	ldconfig

clean:
	rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)

Return to bug 252766

Lines 4-26 Link Here

(-)FreeImage.old/Makefile.fip (-13 / +14 lines)
4	include fipMakefile.srcs	4	include fipMakefile.srcs
5		5
6	# General configuration variables:	6	# General configuration variables:
7	CC = gcc	7	DESTDIR ?= /
8	CXX = g++	8	INCDIR ?= $(DESTDIR)/usr/include
9	AR = ar	9	INSTALLDIR ?= $(DESTDIR)/usr/lib
10
11	INCDIR = /usr/include
12	INSTALLDIR = /usr/lib
13		10
14	# Converts cr/lf to just lf	11	# Converts cr/lf to just lf
15	DOS2UNIX = dos2unix	12	DOS2UNIX = dos2unix
16		13
17	COMPILERFLAGS = -O3 -fexceptions -fvisibility=hidden
18	LIBRARIES = -lstdc++	14	LIBRARIES = -lstdc++
19		15
20	MODULES = $(SRCS:.c=.o)	16	MODULES = $(SRCS:.c=.o)
21	MODULES := $(MODULES:.cpp=.o)	17	MODULES := $(MODULES:.cpp=.o)
22	CFLAGS = $(COMPILERFLAGS) $(INCLUDE)	18	CFLAGS ?= -O3 -fexceptions -fvisibility=hidden
23	CXXFLAGS = $(COMPILERFLAGS) -Wno-ctor-dtor-privacy $(INCLUDE)	19	CFLAGS += $(INCLUDE)
		20	CXXFLAGS ?= -O3 -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy
		21	CXXFLAGS += $(INCLUDE)
		22
		23	ifeq ($(shell sh -c 'uname -m 2>/dev/null \|\| echo not'),x86_64)
		24	CFLAGS += -fPIC
		25	CXXFLAGS += -fPIC
		26	endif
24		27
25	TARGET = freeimageplus	28	TARGET = freeimageplus
26	STATICLIB = lib$(TARGET).a	29	STATICLIB = lib$(TARGET).a
Lines 56-71 $(STATICLIB): $(MODULES) Link Here
56	$(AR) r $@ $(MODULES)	59	$(AR) r $@ $(MODULES)
57		60
58	$(SHAREDLIB): $(MODULES)	61	$(SHAREDLIB): $(MODULES)
59	$(CC) -s -shared -Wl,-soname,$(VERLIBNAME) -o $@ $(MODULES) $(LIBRARIES)	62	$(CC) -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES)
60		63
61	install:	64	install:
		65	install -d $(INCDIR) $(INSTALLDIR)
62	install -m 644 -o root -g root $(HEADER) $(INCDIR)	66	install -m 644 -o root -g root $(HEADER) $(INCDIR)
63	install -m 644 -o root -g root $(HEADERFIP) $(INCDIR)	67	install -m 644 -o root -g root $(HEADERFIP) $(INCDIR)
64	install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)	68	install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
65	install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)	69	install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
66	ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
67	ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)
68	ldconfig
69		70
70	clean:	71	clean:
71	rm -f core Dist/. u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)	72	rm -f core Dist/. u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)

Lines 4-26 Link Here

(-)FreeImage.old/Makefile.gnu (-13 / +14 lines)
4	include Makefile.srcs	4	include Makefile.srcs
5		5
6	# General configuration variables:	6	# General configuration variables:
7	CC = gcc	7	DESTDIR ?= /
8	CXX = g++	8	INCDIR ?= $(DESTDIR)/usr/include
9	AR = ar	9	INSTALLDIR ?= $(DESTDIR)/usr/lib
10
11	INCDIR = /usr/include
12	INSTALLDIR = /usr/lib
13		10
14	# Converts cr/lf to just lf	11	# Converts cr/lf to just lf
15	DOS2UNIX = dos2unix	12	DOS2UNIX = dos2unix
16		13
17	COMPILERFLAGS = -O3 -fPIC -fexceptions -fvisibility=hidden
18	LIBRARIES = -lstdc++	14	LIBRARIES = -lstdc++
19		15
20	MODULES = $(SRCS:.c=.o)	16	MODULES = $(SRCS:.c=.o)
21	MODULES := $(MODULES:.cpp=.o)	17	MODULES := $(MODULES:.cpp=.o)
22	CFLAGS = $(COMPILERFLAGS) $(INCLUDE)	18	CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden
23	CXXFLAGS = $(COMPILERFLAGS) -Wno-ctor-dtor-privacy $(INCLUDE)	19	CFLAGS += $(INCLUDE)
		20	CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy
		21	CXXFLAGS += $(INCLUDE)
		22
		23	ifeq ($(shell sh -c 'uname -m 2>/dev/null \|\| echo not'),x86_64)
		24	CFLAGS += -fPIC
		25	CXXFLAGS += -fPIC
		26	endif
24		27
25	TARGET = freeimage	28	TARGET = freeimage
26	STATICLIB = lib$(TARGET).a	29	STATICLIB = lib$(TARGET).a
Lines 55-69 $(STATICLIB): $(MODULES) Link Here
55	$(AR) r $@ $(MODULES)	58	$(AR) r $@ $(MODULES)
56		59
57	$(SHAREDLIB): $(MODULES)	60	$(SHAREDLIB): $(MODULES)
58	$(CC) -s -shared -Wl,-soname,$(VERLIBNAME) -o $@ $(MODULES) $(LIBRARIES)	61	$(CC) -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES)
59		62
60	install:	63	install:
		64	install -d $(INCDIR) $(INSTALLDIR)
61	install -m 644 -o root -g root $(HEADER) $(INCDIR)	65	install -m 644 -o root -g root $(HEADER) $(INCDIR)
62	install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)	66	install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
63	install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)	67	install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
64	ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
65	ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)
66	ldconfig
67		68
68	clean:	69	clean:
69	rm -f core Dist/. u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)	70	rm -f core Dist/. u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)