Skip to content

Commit

Permalink
delete *.pb.cc & *.pb.h in make clean
Browse files Browse the repository at this point in the history
  • Loading branch information
xiezl committed May 6, 2015
1 parent 6778b5c commit e900cd4
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 97 deletions.
90 changes: 0 additions & 90 deletions Makefile

This file was deleted.

8 changes: 6 additions & 2 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,13 @@ MSHADOW_FLAGS = -DMSHADOW_USE_CUDA=0 -DMSHADOW_USE_CBLAS=1 -DMSHADOW_USE_MKL=0
AC_CXXFLAGS = -O3 -Wall -pthread -fPIC -std=c++11 -Wno-unknown-pragmas \
$(MSHADOW_FLAGS) -DCPU_ONLY=1 -funroll-loops

INCLUDES=-I$(top_srcdir)/include

PROTOS := src/proto/cluster.proto src/proto/model.proto
PROTO_SRCS := src/proto/cluster.pb.cc src/proto/model.pb.cc
PROTO_HDRS := src/proto/cluster.pb.h src/proto/model.pb.h
PROTO_OBJS := src/proto/cluster.pb.o src/proto/model.pb.o

SINGA_SRCS := src/utils/cluster.cc \
src/utils/graph.cc \
src/utils/common.cc \
Expand Down Expand Up @@ -79,7 +82,6 @@ lib_LTLIBRARIES = libsinga.la
libsinga_la_SOURCES = $(PROTO_HDRS) $(PROTO_SRCS) $(SINGA_SRCS) $(SINGA_HDRS)
libsinga_la_CXXFLAGS = -O3 -Wall -pthread -fPIC -std=c++11 -Wno-unknown-pragmas \
$(MSHADOW_FLAGS) -DCPU_ONLY=1 -funroll-loops -gdwarf-2 -gstrict-dwarf -Woverloaded-virtual
INCLUDES=-I$(top_srcdir)/include
libsinga_la_LDFLAGS = -I./include

bin_PROGRAMS=singa
Expand All @@ -96,11 +98,13 @@ singa_LDFLAGS = -I./include \
-lopencv_imgproc \
-lopencv_core \
-lopenblas \
-lgtest \
-lzmq \
-lczmq \
-llmdb

clean-local:
rm -rf $(PROTO_SRCS) $(PROTO_HDRS)


$(PROTO_HDRS) $(PROTO_SRCS): $(PROTOS)
protoc --proto_path=src/proto --cpp_out=src/proto $(PROTOS)
Expand Down
12 changes: 7 additions & 5 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@ MSHADOW_FLAGS = -DMSHADOW_USE_CUDA=0 -DMSHADOW_USE_CBLAS=1 -DMSHADOW_USE_MKL=0
AC_CXXFLAGS = -O3 -Wall -pthread -fPIC -std=c++11 -Wno-unknown-pragmas \
$(MSHADOW_FLAGS) -DCPU_ONLY=1 -funroll-loops

INCLUDES = -I$(top_srcdir)/include
PROTOS := src/proto/cluster.proto src/proto/model.proto
PROTO_SRCS := src/proto/cluster.pb.cc src/proto/model.pb.cc
PROTO_HDRS := src/proto/cluster.pb.h src/proto/model.pb.h
Expand Down Expand Up @@ -303,7 +304,6 @@ libsinga_la_SOURCES = $(PROTO_HDRS) $(PROTO_SRCS) $(SINGA_SRCS) $(SINGA_HDRS)
libsinga_la_CXXFLAGS = -O3 -Wall -pthread -fPIC -std=c++11 -Wno-unknown-pragmas \
$(MSHADOW_FLAGS) -DCPU_ONLY=1 -funroll-loops -gdwarf-2 -gstrict-dwarf -Woverloaded-virtual

INCLUDES = -I$(top_srcdir)/include
libsinga_la_LDFLAGS = -I./include
singa_SOURCES = src/main.cc
singa_CXXFLAGS = -O3 -Wall -pthread -fPIC -std=c++11 -MMD -Wno-unknown-pragmas \
Expand All @@ -319,7 +319,6 @@ singa_LDFLAGS = -I./include \
-lopencv_imgproc \
-lopencv_core \
-lopenblas \
-lgtest \
-lzmq \
-lczmq \
-llmdb
Expand Down Expand Up @@ -994,7 +993,7 @@ maintainer-clean-generic:
clean: clean-am

clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
clean-libtool mostlyclean-am
clean-libtool clean-local mostlyclean-am

distclean: distclean-am
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
Expand Down Expand Up @@ -1048,8 +1047,8 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am \

.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
clean-libtool ctags dist dist-all dist-bzip2 dist-gzip \
dist-shar dist-tarZ dist-zip distcheck distclean \
clean-libtool clean-local ctags dist dist-all dist-bzip2 \
dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
distclean-compile distclean-generic distclean-hdr \
distclean-libtool distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
Expand All @@ -1064,6 +1063,9 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
uninstall-libLTLIBRARIES


clean-local:
rm -rf $(PROTO_SRCS) $(PROTO_HDRS)

$(PROTO_HDRS) $(PROTO_SRCS): $(PROTOS)
protoc --proto_path=src/proto --cpp_out=src/proto $(PROTOS)
mkdir -p include/proto/
Expand Down

0 comments on commit e900cd4

Please sign in to comment.