File xenstore-Makefile.diff of Package xenstore-uvp
Index: xen-4.1.6.1/tools/xenstore/Makefile =================================================================== --- xen-4.1.6.1.orig/tools/xenstore/Makefile +++ xen-4.1.6.1/tools/xenstore/Makefile @@ -3,8 +3,9 @@ include $(XEN_ROOT)/tools/Rules.mk MAJOR = 3.0 MINOR = 0 +CFLAGS += $(RPM_OPT_FLAGS) CFLAGS += -Werror CFLAGS += -I. CFLAGS += $(CFLAGS_libxenctrl) @@ -19,15 +20,15 @@ XENSTORED_OBJS_$(CONFIG_NetBSD) = xensto XENSTORED_OBJS += $(XENSTORED_OBJS_y) ifneq ($(XENSTORE_STATIC_CLIENTS),y) -LIBXENSTORE := libxenstore.so +LIBXENSTORE := libxenstore_uvp.so else -LIBXENSTORE := libxenstore.a +LIBXENSTORE := libxenstore_uvp.a xenstore xenstore-control: CFLAGS += -static endif -ALL_TARGETS = libxenstore.so libxenstore.a clients xs_tdb_dump xenstored +ALL_TARGETS = libxenstore_uvp.so libxenstore.a clients xs_tdb_dump xenstored .PHONY: all all: $(ALL_TARGETS) @@ -52,27 +53,27 @@ xenstored: $(XENSTORED_OBJS) $(CLIENTS): xenstore ln -f xenstore $@ xenstore: xenstore_client.o $(LIBXENSTORE) - $(CC) $(CFLAGS) $(LDFLAGS) $< -L. -lxenstore $(SOCKET_LIBS) -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) $< -L. -lxenstore_uvp $(SOCKET_LIBS) -o $@ xenstore-control: xenstore_control.o $(LIBXENSTORE) - $(CC) $(CFLAGS) $(LDFLAGS) $< -L. -lxenstore $(SOCKET_LIBS) -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) $< -L. -lxenstore_uvp $(SOCKET_LIBS) -o $@ xs_tdb_dump: xs_tdb_dump.o utils.o tdb.o talloc.o $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -libxenstore.so: libxenstore.so.$(MAJOR) +libxenstore_uvp.so: libxenstore_uvp.so.$(MAJOR) ln -sf $< $@ -libxenstore.so.$(MAJOR): libxenstore.so.$(MAJOR).$(MINOR) +libxenstore_uvp.so.$(MAJOR): libxenstore_uvp.so.$(MAJOR).$(MINOR) ln -sf $< $@ xs.opic: CFLAGS += -DUSE_PTHREAD -libxenstore.so.$(MAJOR).$(MINOR): xs.opic xs_lib.opic - $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenstore.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(SOCKET_LIBS) -lpthread +libxenstore_uvp.so.$(MAJOR).$(MINOR): xs.opic xs_lib.opic + $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenstore_uvp.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(SOCKET_LIBS) -lpthread -libxenstore.a: xs.o xs_lib.o +libxenstore_uvp.a: xs.o xs_lib.o $(AR) rcs $@ $^ .PHONY: clean clean:
