Permalink
Browse files

Re-apply build system changes

  • Loading branch information...
1 parent 1026038 commit 47eb0ffd58b286da36debe560242cc239e9abb0b @gholms gholms committed Jan 19, 2011
Showing with 2,784 additions and 6,300 deletions.
  1. +3 −3 cluster/Makefile
  2. +2,455 −6,058 configure
  3. +34 −32 configure.ac
  4. +286 −201 eucalyptus-eee.spec
  5. +3 −3 gatherlog/Makefile
  6. +2 −2 node/Makefile
  7. +1 −1 storage/Makefile
View
@@ -44,15 +44,15 @@ generated/stubs: $(CCWSDL) $(NCWSDL)
server: $(SERVICE_SO)
-$(SERVICE_SO): generated/stubs ../storage/storage.o server-marshal.o handlers.o handlers-state.o server-marshal-state.o $(AXIS2C_HOME)/lib/libaxutil.so ../util/windows-bundle.o
+$(SERVICE_SO): generated/stubs ../storage/storage.o server-marshal.o handlers.o handlers-state.o server-marshal-state.o ../util/windows-bundle.o
$(CC) -shared generated/*.o server-marshal.o handlers.o handlers-state.o server-marshal-state.o ../util/windows-bundle.o $(SCLIBS) $(NCLIBS) $(VNLIBS) $(WSSECLIBS) $(CC_LIBS) -o $(SERVICE_SO)
client: $(CLIENT)_full $(CLIENTKILLALL)
-$(CLIENT)_full: generated/stubs $(CLIENT).c cc-client-marshal-adb.c handlers.o handlers-state.o $(AXIS2C_HOME)/lib/libaxutil.so
+$(CLIENT)_full: generated/stubs $(CLIENT).c cc-client-marshal-adb.c handlers.o handlers-state.o
$(CC) -o $(CLIENT)_full $(CFLAGS) $(INCLUDES) $(CC_LIBS) generated/adb_*.o generated/axis2_stub_*.o ../util/misc.o $(WSSECLIBS) $(CLIENT).c cc-client-marshal-adb.c -DMODE=1
-$(CLIENTKILLALL): generated/stubs $(CLIENT).c cc-client-marshal-adb.c handlers.o handlers-state.o $(AXIS2C_HOME)/lib/libaxutil.so
+$(CLIENTKILLALL): generated/stubs $(CLIENT).c cc-client-marshal-adb.c handlers.o handlers-state.o
$(CC) -o $(CLIENTKILLALL) $(CFLAGS) $(INCLUDES) $(CC_LIBS) generated/adb_*.o generated/axis2_stub_*.o ../util/misc.o $(WSSECLIBS) $(CLIENT).c cc-client-marshal-adb.c -DMODE=0
deploy:
Oops, something went wrong.

0 comments on commit 47eb0ff

Please sign in to comment.