Attachment #299181 for bug #93982

Lines 8-17 Link Here

(-)Makefile.old (-4 lines)
8	VERSION = 2.1.3	8	VERSION = 2.1.3
9	SHELL = /bin/sh	9	SHELL = /bin/sh
10		10
11	# Compilation settings
12	CFLAGS=-Wall
13	OPTFLAGS=-Os
14
15	#	11	#
16	# Set which pgl modules shall be built	12	# Set which pgl modules shall be built
17	#	13	#

Lines 3-9 Link Here

(-)pgld/Makefile.old (-2 / +2 lines)
3	# This Makefile gets executed by the main pgl Makefile. Don't execute it directly!	3	# This Makefile gets executed by the main pgl Makefile. Don't execute it directly!
4	# TODO: check this: ifeq (0,${MAKELEVEL})	4	# TODO: check this: ifeq (0,${MAKELEVEL})
5		5
6	CC=gcc	6	CC?=gcc
7	CFLAGS+= \	7	CFLAGS+= \
8	-DVERSION=\"$(VERSION)\" \	8	-DVERSION=\"$(VERSION)\" \
9	-DPACKAGE_NAME=\"$(PKGNAME)\" \	9	-DPACKAGE_NAME=\"$(PKGNAME)\" \
Lines 76-82 Link Here
76	$(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS) $(LIBS)	76	$(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS) $(LIBS)
77		77
78	src/dbus.so: src/dbus.o	78	src/dbus.so: src/dbus.o
79	$(CC) -o $@ $^ $(CFLAGS) -shared	79	$(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS) -shared
80		80
81	clean:	81	clean:
82	rm -rf *~ \	82	rm -rf *~ \




# This Makefile gets executed by the main pgl Makefile. Don't execute it directly!
# TODO: check this: ifeq (0,${MAKELEVEL})

CXX?=g++
MOC=moc
UIC=uic
RCC=rcc

QTINC:=/usr/include/qt4
# LDFLAGS += \

QTDIR:=/usr/share/qt4
QTINC:=$(QTDIR)/include
INCPATH:=\
	-I$(QTINC) \
	-I$(QTINC)/Qt \
	-I$(QTINC)/QtCore \
	-I$(QTINC)/QtGui \
	-I$(QTINC)/QtDBus\

# endif

ifeq ($(PROFILE),yes)
CXXFLAGS+=-pg
LDFLAGS+=-pg
endif

ifeq ($(DEBUG),yes)
CXXFLAGS+=-ggdb3
LDFLAGS+=-ggdb3
OPTFLAGS=-O0
endif

CXXFLAGS+=$(OPTFLAGS)

# source (.cpp files) with header (.h) file in folder src/
# so main.cpp is missing here because it has no header file

#   build/obj/qrc_images.o
#   -L/usr/lib -lQtGui -lQtNetwork -lQtCore -lpthread
pgl-gui: $(SOURCESDIR)/main.o $(SOURCES:cpp=o) $(MOC_SOURCES_OBJECTS) qrc_images.o
	$(CXX) $(CXXFLAGS) \
		$(SOURCESDIR)/main.o \
		$(SOURCES:cpp=o) \
		$(MOC_SOURCES_OBJECTS) \
		qrc_images.o \
		$(LDFLAGS) \
		-L/usr/@LIB@/qt4 -lQtDBus -lQtGui -lQtCore -lpthread \
		-o $@

# objects of main and SOURCES

#  -o build/obj/add_exception_dialog.o
#  src/add_exception_dialog.cpp
$(SOURCESDIR)/main.o $(SOURCES:cpp=o): %.o: %.cpp $(FORMS_HEADERS)
	$(CXX) $(CXXFLAGS) \
		-D_REENTRANT -Wall -W -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED \
		$(INCPATH) \
		-c $< \
		-o $@

#  -o build/obj/moc_add_exception_dialog.o
#  build/moc/moc_add_exception_dialog.cpp
$(MOC_SOURCES_OBJECTS): $(SOURCESDIR)/moc_%.o: $(SOURCESDIR)/moc_%.cpp $(FORMS_HEADERS)
	$(CXX) $(CXXFLAGS) \
		-D_REENTRANT -Wall -W -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED \
		$(INCPATH) \
		-c $< \
		-o $@

#  -o build/obj/qrc_images.o
#  qrc_images.cpp
qrc_images.o: qrc_images.cpp
	$(CXX) $(CXXFLAGS) \
		-D_REENTRANT -Wall -W -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED \
		$(INCPATH) \
		-c qrc_images.cpp \
		-o qrc_images.o

Return to bug 93982

Lines 3-20 Link Here

(-)pgl-gui/Makefile.old (-17 / +15 lines)
3	# This Makefile gets executed by the main pgl Makefile. Don't execute it directly!	3	# This Makefile gets executed by the main pgl Makefile. Don't execute it directly!
4	# TODO: check this: ifeq (0,${MAKELEVEL})	4	# TODO: check this: ifeq (0,${MAKELEVEL})
5		5
6	CC=g++	6	CXX?=g++
7	MOC=moc	7	MOC=moc
8	UIC=uic	8	UIC=uic
9	RCC=rcc	9	RCC=rcc
10		10
11	# CFLAGS += \	11	QTINC:=/usr/include/qt4
12	# LDFLAGS += \
13
14	QTDIR:=/usr/share/qt4
15	QTINC:=$(QTDIR)/include
16	INCPATH:=\	12	INCPATH:=\
17	-I$(QTINC) \	13	-I$(QTINC) \
		14	-I$(QTINC)/Qt \
18	-I$(QTINC)/QtCore \	15	-I$(QTINC)/QtCore \
19	-I$(QTINC)/QtGui \	16	-I$(QTINC)/QtGui \
20	-I$(QTINC)/QtDBus\	17	-I$(QTINC)/QtDBus\
Lines 36-52 Link Here
36	# endif	33	# endif
37		34
38	ifeq ($(PROFILE),yes)	35	ifeq ($(PROFILE),yes)
39	CFLAGS+=-pg	36	CXXFLAGS+=-pg
40	LDFLAGS+=-pg	37	LDFLAGS+=-pg
41	endif	38	endif
42		39
43	ifeq ($(DEBUG),yes)	40	ifeq ($(DEBUG),yes)
44	CFLAGS+=-ggdb3	41	CXXFLAGS+=-ggdb3
45	LDFLAGS+=-ggdb3	42	LDFLAGS+=-ggdb3
46	OPTFLAGS=-O0	43	OPTFLAGS=-O0
47	endif	44	endif
48		45
49	CFLAGS+=$(OPTFLAGS)	46	CXXFLAGS+=$(OPTFLAGS)
50		47
51	# source (.cpp files) with header (.h) file in folder src/	48	# source (.cpp files) with header (.h) file in folder src/
52	# so main.cpp is missing here because it has no header file	49	# so main.cpp is missing here because it has no header file
Lines 93-104 Link Here
93	# build/obj/qrc_images.o	90	# build/obj/qrc_images.o
94	# -L/usr/lib -lQtGui -lQtNetwork -lQtCore -lpthread	91	# -L/usr/lib -lQtGui -lQtNetwork -lQtCore -lpthread
95	pgl-gui: $(SOURCESDIR)/main.o $(SOURCES:cpp=o) $(MOC_SOURCES_OBJECTS) qrc_images.o	92	pgl-gui: $(SOURCESDIR)/main.o $(SOURCES:cpp=o) $(MOC_SOURCES_OBJECTS) qrc_images.o
96	$(CC) \	93	$(CXX) $(CXXFLAGS) \
97	$(SOURCESDIR)/main.o \	94	$(SOURCESDIR)/main.o \
98	$(SOURCES:cpp=o) \	95	$(SOURCES:cpp=o) \
99	$(MOC_SOURCES_OBJECTS) \	96	$(MOC_SOURCES_OBJECTS) \
100	qrc_images.o \	97	qrc_images.o \
101	-L/usr/lib -lQtDBus -lQtGui -lQtCore -lpthread \	98	$(LDFLAGS) \
		99	-L/usr/@LIB@/qt4 -lQtDBus -lQtGui -lQtCore -lpthread \
102	-o $@	100	-o $@
103		101
104	# objects of main and SOURCES	102	# objects of main and SOURCES
Lines 112-119 Link Here
112	# -o build/obj/add_exception_dialog.o	110	# -o build/obj/add_exception_dialog.o
113	# src/add_exception_dialog.cpp	111	# src/add_exception_dialog.cpp
114	$(SOURCESDIR)/main.o $(SOURCES:cpp=o): %.o: %.cpp $(FORMS_HEADERS)	112	$(SOURCESDIR)/main.o $(SOURCES:cpp=o): %.o: %.cpp $(FORMS_HEADERS)
115	$(CC) \	113	$(CXX) $(CXXFLAGS) \
116	-pipe -g -D_REENTRANT -Wall -W -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED \	114	-D_REENTRANT -Wall -W -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED \
117	$(INCPATH) \	115	$(INCPATH) \
118	-c $< \	116	-c $< \
119	-o $@	117	-o $@
Lines 146-153 Link Here
146	# -o build/obj/moc_add_exception_dialog.o	144	# -o build/obj/moc_add_exception_dialog.o
147	# build/moc/moc_add_exception_dialog.cpp	145	# build/moc/moc_add_exception_dialog.cpp
148	$(MOC_SOURCES_OBJECTS): $(SOURCESDIR)/moc_%.o: $(SOURCESDIR)/moc_%.cpp $(FORMS_HEADERS)	146	$(MOC_SOURCES_OBJECTS): $(SOURCESDIR)/moc_%.o: $(SOURCESDIR)/moc_%.cpp $(FORMS_HEADERS)
149	$(CC) \	147	$(CXX) $(CXXFLAGS) \
150	-pipe -g -D_REENTRANT -Wall -W -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED \	148	-D_REENTRANT -Wall -W -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED \
151	$(INCPATH) \	149	$(INCPATH) \
152	-c $< \	150	-c $< \
153	-o $@	151	-o $@
Lines 172-179 Link Here
172	# -o build/obj/qrc_images.o	170	# -o build/obj/qrc_images.o
173	# qrc_images.cpp	171	# qrc_images.cpp
174	qrc_images.o: qrc_images.cpp	172	qrc_images.o: qrc_images.cpp
175	$(CC) \	173	$(CXX) $(CXXFLAGS) \
176	-pipe -g -D_REENTRANT -Wall -W -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED \	174	-D_REENTRANT -Wall -W -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED \
177	$(INCPATH) \	175	$(INCPATH) \
178	-c qrc_images.cpp \	176	-c qrc_images.cpp \
179	-o qrc_images.o	177	-o qrc_images.o