From 412ce970fbac301ff0d6c08e11938da3dcee5558 Mon Sep 17 00:00:00 2001 From: Kostyantyn Ovechko Date: Mon, 16 Aug 2010 04:18:32 +0300 Subject: Erase deprecated lines in Makefile files --- request/Makefile | 1 - seggetd/Makefile | 4 ---- tuiclient/Makefile | 25 ------------------------- 3 files changed, 30 deletions(-) diff --git a/request/Makefile b/request/Makefile index ed06bf5..d5f5412 100644 --- a/request/Makefile +++ b/request/Makefile @@ -6,7 +6,6 @@ LIBS_PKGCONFIG := $(foreach mod,$(PKGCONFIG_MODULES),$(shell pkg-config --libs $ CXXFLAGS_PKGCONFIG := $(foreach mod,$(PKGCONFIG_MODULES),$(shell pkg-config --libs $(mod))) CXXFLAGS_WARNINGS = -pedantic -Wall -Wextra -Wformat -Weffc++ -#CXXFLAGS_WARNINGS = -pedantic -Wextra -Wformat -Weffc++ CXXFLAGS_OPT = -O0 -g3 LIBS = $(LIBS_PKGCONFIG) diff --git a/seggetd/Makefile b/seggetd/Makefile index 2c66cb9..dd3674e 100644 --- a/seggetd/Makefile +++ b/seggetd/Makefile @@ -6,11 +6,9 @@ LIBS_PKGCONFIG := $(foreach mod,$(PKGCONFIG_MODULES),$(shell pkg-config --libs $ CXXFLAGS_PKGCONFIG := $(foreach mod,$(PKGCONFIG_MODULES),$(shell pkg-config --libs $(mod))) CXXFLAGS_WARNINGS = -pedantic -Wall -Wextra -Wformat -Weffc++ -#CXXFLAGS_WARNINGS = -pedantic -Wextra -Wformat -Weffc++ CXXFLAGS_OPT = -O2 -g LIBS = $(LIBS_PKGCONFIG) -#MIBS = -lncurses CXXFLAGS = $(CXXFLAGS_PKGCONFIG) -lncurses $(CXXFLAGS_WARNINGS) $(CXXFLAGS_OPT) all: $(BINS) @@ -20,8 +18,6 @@ all: $(BINS) seggetd: seggetd.o connection.o checksum.o config.o distfile.o log.o mirror.o network.o networkbroker.o phase.o pkg.o response.o segment.o settings.o stats.o str.o tui.o utils.o ui_server.o proxyfetcher.o requestserver.o scriptserver.o $(CXX) -o $@ -lncurses -lcryptopp $(LIBS) $(CIBS) $^ -#%: %.o -# $(CXX) -o $@ $(LIBS) $(CIBS) $^ clean: -rm -f $(BINS) $(OBJS) diff --git a/tuiclient/Makefile b/tuiclient/Makefile index f2e93de..1f08545 100644 --- a/tuiclient/Makefile +++ b/tuiclient/Makefile @@ -6,40 +6,15 @@ LIBS_PKGCONFIG := $(foreach mod,$(PKGCONFIG_MODULES),$(shell pkg-config --libs $ CXXFLAGS_PKGCONFIG := $(foreach mod,$(PKGCONFIG_MODULES),$(shell pkg-config --libs $(mod))) CXXFLAGS_WARNINGS = -pedantic -Wall -Wextra -Wformat -Weffc++ -#CXXFLAGS_WARNINGS = -pedantic -Wextra -Wformat -Weffc++ CXXFLAGS_OPT = -O2 -g LIBS = $(LIBS_PKGCONFIG) -#CIBS = -lncurses CXXFLAGS = $(CXXFLAGS_PKGCONFIG) -lncurses -lpthread $(CXXFLAGS_WARNINGS) $(CXXFLAGS_OPT) all: clean $(BINS) -#log.o: log.cpp settings.h log.h -#segget.o: segget.cpp pkg.cpp distfile.cpp segment.cpp log.o stats.cpp connection.cpp tui.cpp settings.o mirror.cpp str.cpp checksum.cpp - -#mirror.o: mirror.cpp tui.h -# $(CXX) -c -o $@ mirror.cpp -# -#$(CXXFLAGS) $^ -#segget: segget.cpp log.o mirror.o distfile.o tui.o -#pkg.o distfile.o segment.o mirror.o connection.o settings.o stats.o tui.o log.o -#pkg.o: pkg.cpp pkg.h distfile.h segment.h log.h stats.h connection.h tui.h settings.h config.h str.h mirror.h checksum.h \ -# distfile.o segment.o log.o stats.o connection.o tui.o settings.o config.o str.o mirror.o checksum.o - -#distfile.o: distfile.cpp tui.o -#distfile.o: distfile.cpp checksum.o -#distfile.h segment.h log.h stats.h connection.h tui.h settings.h config.h str.h mirror.h checksum.h -# $(CXX) -c -o $@ $(CXXFLAGS) $^ - -#segment.o: segment.cpp segment.h log.h stats.h connection.h tui.h settings.h config.h str.h - -#segget.o: segget.cpp settings.o pkg.h distfile.h segment.h log.h stats.h connection.h tui.h settings.h config.h str.h mirror.h checksum.h -# %.o: %.cxx $(CXX) -c -o $@ $(CXXFLAGS) $^ -#%: %.o -# $(CXX) -o $@ $(LIBS) $(CIBS) $^ tuiclient: tuiclient.o config.o colors.o distfilewindow.o helpwindow.o log.o mainwindow.o tuidistfile.o twindow.o scrollwindow.o settings.o str.o $(CXX) -o $@ -lncurses -lpthread $(LIBS) $(CIBS) $^ -- cgit v1.2.3-65-gdbad