Skip to content

Commit

Permalink
updated Makefile
Browse files Browse the repository at this point in the history
  • Loading branch information
ekarak committed Mar 18, 2013
1 parent 6861313 commit 033b9c4
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
8 changes: 7 additions & 1 deletion INSTALL.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
(this will worl on Debian 6, you have to adjust according to your distro)

sudo apt-get install ruby1.9.1-dev gccxml libxml2-dev libxslt-dev
sudo apt-get install libboost1.42-dev libboost_system1.42-dev libboost_thread1.42-dev lib libboost-filesystem1.42-dev libboost-program-options1.42-dev
sudo apt-get install libboost1.42-dev libboost_system1.42-dev libboost_thread1.42-dev libboost-filesystem1.42-dev libboost-program-options1.42-dev

sudo gem1.9.1 install mongrel --pre
sudo gem1.9.1 install rspec

# installs the ruby GCCXML client gem without compiling the 'gccxml' executable
# since it was delivered by Debian package
sudo gem1.9.1 install gccxml_gem --platform ruby
# otherwise skip it

sudo gem1.9.1 install rbgccxml
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -94,16 +94,16 @@ gen-cpp/ozw_types.o: gen-cpp/ozw_types.cpp gen-cpp/ozw_types.h
Main.o: Main.cpp gen-cpp/RemoteManager_server.cpp
$(CXX) $(CFLAGS) -c Main.cpp $(INCLUDES)

openzwave: $(LIBZWAVE_STATIC) $(LIBZWAVE_DYNAMIC)
openzwave:
cd $(OPENZWAVE)/cpp/build/linux/; make

booststomp:
cd $(BOOSTSTOMP); make

ozwd.static: Main.o booststomp gen-cpp/RemoteManager.o gen-cpp/ozw_constants.o gen-cpp/ozw_types.o $(LIBZWAVE_STATIC)
ozwd.static: Main.o booststomp gen-cpp/RemoteManager.o gen-cpp/ozw_constants.o gen-cpp/ozw_types.o openzwave
$(CXX) -static -static-libgcc -o $@ $(LDFLAGS) Main.o gen-cpp/RemoteManager.o gen-cpp/ozw_constants.o gen-cpp/ozw_types.o $(LIBZWAVE_STATIC) $(LIBBOOSTSTOMP_STATIC) $(LIBBOOST_STATIC) -lpthread -ludev -lthrift -lrt

ozwd: Main.o booststomp gen-cpp/RemoteManager.o gen-cpp/ozw_constants.o gen-cpp/ozw_types.o $(LIBZWAVE_DYNAMIC)
ozwd: Main.o booststomp gen-cpp/RemoteManager.o gen-cpp/ozw_constants.o gen-cpp/ozw_types.o openzwave
$(CXX) -o $@ $(LDFLAGS) Main.o gen-cpp/RemoteManager.o gen-cpp/ozw_constants.o gen-cpp/ozw_types.o $(LIBZWAVE_DYNAMIC) $(LIBS)

dist: main
Expand Down

0 comments on commit 033b9c4

Please sign in to comment.