Attachment #453806 for bug #600246

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




	GMAKE="make"
fi

GPP=`which clang++`
if test x$GPP = x
then
	GPP="g++"
else
	GPP="$GPP -O0"
fi

GIT=`which git`
if test x$GIT = x
then




SHELL=/bin/sh
OS := $(shell uname -s)
PWD=@PWD@
GPP=@GPP@
INSTALL_DIR=$(DESTDIR)$(prefix)
MAN_DIR=$(DESTDIR)@MAN_DIR@


	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@

%.o: %.cpp $(HEADERS) Makefile
	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@

.PRECIOUS: $(TARGET) $(OBJECTS)

$(TARGET): $(OBJECTS) $(LIBRRDTOOL) Makefile
	$(CXX) $(OBJECTS) $(CXXFLAGS) $(CPPFLAGS) -Wall $(LIBS) -o $@

$(LUAJIT_LIB):
	cd $(LUAJIT_HOME); @GMAKE@

Return to bug 600246

Lines 341-354 Link Here

(-)ntopng-2.4-stable.orig/configure.ac (-8 lines)
341	GMAKE="make"	341	GMAKE="make"
342	fi	342	fi
343		343
344	GPP=`which clang++`
345	if test x$GPP = x
346	then
347	GPP="g++"
348	else
349	GPP="$GPP -O0"
350	fi
351
352	GIT=`which git`	344	GIT=`which git`
353	if test x$GIT = x	345	if test x$GIT = x
354	then	346	then

Lines 4-10 Link Here

(-)ntopng-2.4-stable.orig/Makefile.in (-3 / +2 lines)
4	SHELL=/bin/sh	4	SHELL=/bin/sh
5	OS := $(shell uname -s)	5	OS := $(shell uname -s)
6	PWD=@PWD@	6	PWD=@PWD@
7	GPP=@GPP@
8	INSTALL_DIR=$(DESTDIR)$(prefix)	7	INSTALL_DIR=$(DESTDIR)$(prefix)
9	MAN_DIR=$(DESTDIR)@MAN_DIR@	8	MAN_DIR=$(DESTDIR)@MAN_DIR@
10		9
Lines 126-137 Link Here
126	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@	125	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
127		126
128	%.o: %.cpp $(HEADERS) Makefile	127	%.o: %.cpp $(HEADERS) Makefile
129	$(GPP) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@	128	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
130		129
131	.PRECIOUS: $(TARGET) $(OBJECTS)	130	.PRECIOUS: $(TARGET) $(OBJECTS)
132		131
133	$(TARGET): $(OBJECTS) $(LIBRRDTOOL) Makefile	132	$(TARGET): $(OBJECTS) $(LIBRRDTOOL) Makefile
134	$(GPP) $(OBJECTS) -Wall $(LIBS) -o $@	133	$(CXX) $(OBJECTS) $(CXXFLAGS) $(CPPFLAGS) -Wall $(LIBS) -o $@
135		134
136	$(LUAJIT_LIB):	135	$(LUAJIT_LIB):
137	cd $(LUAJIT_HOME); @GMAKE@	136	cd $(LUAJIT_HOME); @GMAKE@