Attachment #185363 for bug #261763

View | Details | Raw Unified | Return to bug 261763
Collapse All | Expand All




OBJECTS = $(foreach file,$(SOURCES),$(subst .cc,.o,$(file)))

gtkevemon: ${OBJECTS}
	${CXX} -o ${BINARY} ${OBJECTS} ${LDFLAGS}

multicore:
	$(MAKE) -j${CORES} gtkevemon

depend:
	${CXX} -MM ${SOURCES} > Makefile.dep

%.o: %.cc
	${CXX} -c -o $@ $< ${CXXFLAGS}

clean: FORCE
	${RM} ${BINARY} ${OBJECTS}

Lines 1-4 Link Here

(-)a/src/Makefile.linux (-3 / +4 lines)
1	COMPILER = g++	1	CXX ?= g++
2		2
3	CORES = $(shell grep processor /proc/cpuinfo \| wc -l)	3	CORES = $(shell grep processor /proc/cpuinfo \| wc -l)
4		4
Lines 9-15 PTH_LIBS = -lpthread Link Here
9	XML_FLAGS = $(shell pkg-config --cflags libxml-2.0)	9	XML_FLAGS = $(shell pkg-config --cflags libxml-2.0)
10	XML_LIBS = $(shell pkg-config --libs libxml-2.0)	10	XML_LIBS = $(shell pkg-config --libs libxml-2.0)
11		11
12	CXXFLAGS = ${GCC_FLAGS} ${GTK_FLAGS} ${XML_FLAGS}	12	CXXFLAGS ?= ${GCC_FLAGS}
13	LIBS = ${GTK_LIBS} ${PTH_LIBS} ${XML_LIBS}	13	CXXFLAGS += ${GTK_FLAGS} ${XML_FLAGS}
		14	LDFLAGS += ${GTK_LIBS} ${PTH_LIBS} ${XML_LIBS}
14		15
15	BINARY = gtkevemon	16	BINARY = gtkevemon

Return to bug 261763

Lines 24-39 SOURCES = maingui.cc guiuserdata.cc guiconfiguration.cc guiaboutdialog.cc \ Link Here

(-)a/src/Makefile (-3 / +3 lines)
24	OBJECTS = $(foreach file,$(SOURCES),$(subst .cc,.o,$(file)))	24	OBJECTS = $(foreach file,$(SOURCES),$(subst .cc,.o,$(file)))
25		25
26	gtkevemon: ${OBJECTS}	26	gtkevemon: ${OBJECTS}
27	${COMPILER} -o ${BINARY} ${OBJECTS} ${LIBS}	27	${CXX} -o ${BINARY} ${OBJECTS} ${LDFLAGS}
28		28
29	multicore:	29	multicore:
30	$(MAKE) -j${CORES} gtkevemon	30	$(MAKE) -j${CORES} gtkevemon
31		31
32	depend:	32	depend:
33	${COMPILER} -MM ${SOURCES} > Makefile.dep	33	${CXX} -MM ${SOURCES} > Makefile.dep
34		34
35	%.o: %.cc	35	%.o: %.cc
36	${COMPILER} -c -o $@ $< ${CXXFLAGS}	36	${CXX} -c -o $@ $< ${CXXFLAGS}
37		37
38	clean: FORCE	38	clean: FORCE
39	${RM} ${BINARY} ${OBJECTS}	39	${RM} ${BINARY} ${OBJECTS}