[sword-svn] r1856 - trunk/bindings/corba/orbitcpp

[jansorg at crosswire.org]

Author: jansorg
Date: 2005-10-04 09:27:57 -0700 (Tue, 04 Oct 2005)
New Revision: 1856

Modified:
   trunk/bindings/corba/orbitcpp/Makefile
Log:
makefile fix to search in /usr/include for orbitcpp files

Modified: trunk/bindings/corba/orbitcpp/Makefile
===================================================================
--- trunk/bindings/corba/orbitcpp/Makefile	2005-09-27 14:01:27 UTC (rev 1855)
+++ trunk/bindings/corba/orbitcpp/Makefile	2005-10-04 16:27:57 UTC (rev 1856)
@@ -17,38 +17,38 @@
 #----------------------------------
 
 server: swordorb-common.o server.cpp swordorb-impl.o swordorb-cpp.o swordorb-cpp-common.o swordorb-stubs.o swordorb-cpp-stubs.o swordorb-cpp-skels.o swordorb-skels.o swordorb-cpp.o
-	$(CXX) $(CXXFLAGS) -I. -I/usr/local/include/orbitcpp-2.0/ `orbit2-config --cflags` -o server server.cpp swordorb-impl.o swordorb-common.o swordorb-cpp-common.o swordorb-stubs.o swordorb-cpp-stubs.o swordorb-cpp-skels.o swordorb-skels.o `orbit2-config --libs` -lORBit-2-cpp ${LIBS}
+	$(CXX) $(CXXFLAGS) -I. -I/usr/include/orbitcpp-2.0/ -I/usr/local/include/orbitcpp-2.0/ `orbit2-config --cflags` -o server server.cpp swordorb-impl.o swordorb-common.o swordorb-cpp-common.o swordorb-stubs.o swordorb-cpp-stubs.o swordorb-cpp-skels.o swordorb-skels.o `orbit2-config --libs` -lORBit-2-cpp ${LIBS}
 
 testclient: testclient.cpp swordorb-impl.cpp swordorb-common.o swordorb-cpp-common.o swordorb-stubs.o swordorb-cpp-stubs.o swordorb-skels.o swordorb-cpp-skels.o
-	$(CXX) $(CXXFLAGS) -I. -I/usr/local/include/orbitcpp-2.0/ `orbit2-config --cflags` -o testclient testclient.cpp swordorb-common.o swordorb-cpp-common.o swordorb-stubs.o swordorb-cpp-stubs.o swordorb-skels.o swordorb-cpp-skels.o `orbit2-config --libs` -lORBit-2-cpp
+	$(CXX) $(CXXFLAGS) -I. -I/usr/include/orbitcpp-2.0/ -I/usr/local/include/orbitcpp-2.0/ `orbit2-config --cflags` -o testclient testclient.cpp swordorb-common.o swordorb-cpp-common.o swordorb-stubs.o swordorb-cpp-stubs.o swordorb-skels.o swordorb-cpp-skels.o `orbit2-config --libs` -lORBit-2-cpp
 
 swordorb-cpp.o: swordorb-cpp.cc
-	$(CXX) $(CXXFLAGS) -I. -I/usr/local/include/orbitcpp-2.0/ `orbit2-config --cflags`  -c swordorb-cpp.cc
+	$(CXX) $(CXXFLAGS) -I. -I/usr/include/orbitcpp-2.0/ -I/usr/local/include/orbitcpp-2.0/ `orbit2-config --cflags`  -c swordorb-cpp.cc
 
 swordorb-impl.o: swordorb-impl.cpp
-	$(CXX) $(CXXFLAGS) -I. -I/usr/local/include/orbitcpp-2.0/ `orbit2-config --cflags` -c swordorb-impl.cpp
+	$(CXX) $(CXXFLAGS) -I. -I/usr/include/orbitcpp-2.0/ -I/usr/local/include/orbitcpp-2.0/ `orbit2-config --cflags` -c swordorb-impl.cpp
 
 swordorb-common.o: swordorb-common.c
-	$(CC) $(CFLAGS) -I. -I/usr/local/include/orbitcpp-2.0/ `orbit2-config --cflags` -c swordorb-common.c
+	$(CC) $(CFLAGS) -I. -I/usr/include/orbitcpp-2.0/ -I/usr/local/include/orbitcpp-2.0/ `orbit2-config --cflags` -c swordorb-common.c
 
 swordorb-common.c: ./../swordorb.idl
 	orbit-idl-2 -l c ./../swordorb.idl
 	orbit-idl-2 -l cpp ./../swordorb.idl
 
 swordorb-cpp-common.o: swordorb-cpp-common.cc
-	$(CXX) $(CXXFLAGS) -I. -I/usr/local/include/orbitcpp-2.0/ `orbit2-config --cflags` -c swordorb-cpp-common.cc
+	$(CXX) $(CXXFLAGS) -I. -I/usr/include/orbitcpp-2.0/ -I/usr/local/include/orbitcpp-2.0/ `orbit2-config --cflags` -c swordorb-cpp-common.cc
 
 swordorb-stubs.o: swordorb-stubs.c
-	$(CC) $(CFLAGS) -I. -I/usr/local/include/orbitcpp-2.0/ `orbit2-config --cflags` -c swordorb-stubs.c
+	$(CC) $(CFLAGS) -I. -I/usr/include/orbitcpp-2.0/ -I/usr/local/include/orbitcpp-2.0/ `orbit2-config --cflags` -c swordorb-stubs.c
 
 swordorb-cpp-stubs.o: swordorb-cpp-stubs.cc
-	$(CXX) $(CXXFLAGS) -I. -I/usr/local/include/orbitcpp-2.0/ `orbit2-config --cflags` -c swordorb-cpp-stubs.cc
+	$(CXX) $(CXXFLAGS) -I. -I/usr/include/orbitcpp-2.0/ -I/usr/local/include/orbitcpp-2.0/ `orbit2-config --cflags` -c swordorb-cpp-stubs.cc
 
 swordorb-skels.o: swordorb-skels.c
-	$(CC) $(CFLAGS) -I. -I/usr/local/include/orbitcpp-2.0/ `orbit2-config --cflags` -c swordorb-skels.c
+	$(CC) $(CFLAGS) -I. -I/usr/include/orbitcpp-2.0/ -I/usr/local/include/orbitcpp-2.0/ `orbit2-config --cflags` -c swordorb-skels.c
 
 swordorb-cpp-skels.o: swordorb-cpp-skels.cc
-	$(CXX) $(CXXFLAGS) -I. -I/usr/local/include/orbitcpp-2.0/ `orbit2-config --cflags` -c swordorb-cpp-skels.cc
+	$(CXX) $(CXXFLAGS) -I. -I/usr/include/orbitcpp-2.0/ -I/usr/local/include/orbitcpp-2.0/ `orbit2-config --cflags` -c swordorb-cpp-skels.cc
 
 clean:
 	rm -f *.h *.cc *.o *.c server testclient