ia64/xen-unstable

changeset 6559:ae390c2b9d4c

Sync Makefile with xen-unstable.hg. This should fix x86-64 bit build.
author adsharma@los-vmm.sc.intel.com
date Mon Aug 29 16:05:29 2005 -0700 (2005-08-29)
parents 0bc9e2af21c8
children 287d36b46fa3
files tools/xenstore/Makefile
line diff
     1.1 --- a/tools/xenstore/Makefile	Mon Aug 29 15:31:51 2005 -0700
     1.2 +++ b/tools/xenstore/Makefile	Mon Aug 29 16:05:29 2005 -0700
     1.3 @@ -24,7 +24,7 @@ TESTDIR  = `pwd`/testsuite/tmp
     1.4  TESTFLAGS= -DTESTING
     1.5  TESTENV  = XENSTORED_ROOTDIR=$(TESTDIR) XENSTORED_RUNDIR=$(TESTDIR)
     1.6  
     1.7 -all: xen xenstored libxenstore.a libxenstore-pic.a
     1.8 +all: xen xenstored libxenstore.so
     1.9  
    1.10  testcode: xen xs_test xenstored_test xs_random xs_dom0_test
    1.11  
    1.12 @@ -53,20 +53,14 @@ xs_test_lib.o: xs.c
    1.13  talloc_test.o: talloc.c
    1.14  	$(COMPILE.c) -o $@ $<
    1.15  
    1.16 -LIB_OBJS     := xs.o xs_lib.o
    1.17 -
    1.18 -LIB_OBJS_A   := $(patsubst %.o,libxenstore.a(%.o),$(LIB_OBJS))
    1.19 -LIB_OBJS_PIC := $(patsubst %.o,libxenstore-pic.a(%.opic),$(LIB_OBJS))
    1.20 -
    1.21 -libxenstore.a: $(LIB_OBJS_A)
    1.22 -
    1.23 -libxenstore-pic.a: $(LIB_OBJS_PIC)
    1.24 +libxenstore.so: xs.opic xs_lib.opic
    1.25 +	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,-soname -Wl,libxenstore.so -shared -o $@ $^
    1.26  
    1.27  clean: testsuite-clean
    1.28 -	rm -f *.o *.opic *.a
    1.29 +	rm -f *.o *.opic *.so
    1.30  	rm -f xen xenstored xs_random xs_stress xs_crashme
    1.31  	rm -f xs_test xenstored_test xs_dom0_test
    1.32 -	-$(RM) $(PROG_DEP)
    1.33 +	$(RM) $(PROG_DEP)
    1.34  
    1.35  print-dir:
    1.36  	@echo -n tools/xenstore: 
    1.37 @@ -117,15 +111,14 @@ TAGS:
    1.38  tarball: clean
    1.39  	cd .. && tar -c -j -v -h -f xenstore.tar.bz2 xenstore/
    1.40  
    1.41 -install: xenstored libxenstore.a libxenstore-pic.a
    1.42 +install: xenstored libxenstore.so
    1.43  	$(INSTALL_DIR) -p $(DESTDIR)/var/run/xenstored
    1.44  	$(INSTALL_DIR) -p $(DESTDIR)/var/lib/xenstored
    1.45  	$(INSTALL_DIR) -p $(DESTDIR)/usr/sbin
    1.46  	$(INSTALL_DIR) -p $(DESTDIR)/usr/include
    1.47  	$(INSTALL_PROG) xenstored $(DESTDIR)/usr/sbin
    1.48  	$(INSTALL_DIR) -p $(DESTDIR)/usr/$(LIBDIR)
    1.49 -	$(INSTALL_DATA) libxenstore.a $(DESTDIR)/usr/$(LIBDIR)
    1.50 -	$(INSTALL_DATA) libxenstore-pic.a $(DESTDIR)/usr/$(LIBDIR)
    1.51 +	$(INSTALL_DATA) libxenstore.so $(DESTDIR)/usr/$(LIBDIR)
    1.52  	$(INSTALL_DATA) xs.h $(DESTDIR)/usr/include
    1.53  	$(INSTALL_DATA) xs_lib.h $(DESTDIR)/usr/include
    1.54