1.1 --- a/tools/libxc/Makefile	Tue Jan 25 15:37:49 2005 +0000
     1.2 +++ b/tools/libxc/Makefile	Tue Jan 25 15:59:28 2005 +0000
     1.3 @@ -3,10 +3,9 @@ INSTALL_PROG	= $(INSTALL) -m0755
     1.4  INSTALL_DATA	= $(INSTALL) -m0644
     1.5  INSTALL_DIR	= $(INSTALL) -d -m0755
     1.6  
     1.7 -MAJOR		:= 2.0
     1.8 -MINOR		:= 0
     1.9 -LIB_NAME	:= libxc
    1.10 -SONAME		:= $(LIB_NAME).so.$(MAJOR)
    1.11 +MAJOR    = 2.0
    1.12 +MINOR    = 0
    1.13 +SONAME   = libxc.so.$(MAJOR)
    1.14  
    1.15  CC       = gcc
    1.16  
    1.17 @@ -40,10 +39,9 @@ CFLAGS   += $(INCLUDES) -I.
    1.18  CFLAGS   += -Wp,-MD,.$(@F).d
    1.19  DEPS     = .*.d
    1.20  
    1.21 -OBJS     := $(patsubst %.c,%.o,$(SRCS))
    1.22 -PIC_OBJS := $(patsubst %.c,%.opic,$(SRCS))
    1.23 +OBJS     = $(patsubst %.c,%.o,$(SRCS))
    1.24  
    1.25 -LIB		:= $(LIB_NAME).a $(LIB_NAME).so $(LIB_NAME).so.$(MAJOR) $(LIB_NAME).so.$(MAJOR).$(MINOR)
    1.26 +LIB      = libxc.so libxc.so.$(MAJOR) libxc.so.$(MAJOR).$(MINOR)
    1.27  
    1.28  all: check-for-zlib mk-symlinks
    1.29  	$(MAKE) $(LIB)
    1.30 @@ -76,7 +74,7 @@ install: all
    1.31  	$(INSTALL_DATA) xc.h $(DESTDIR)/usr/include
    1.32  
    1.33  clean:
    1.34 -	rm -rf *.a *.so *.o *.opic *.rpm $(LIB) *~ $(DEPS) xen
    1.35 +	rm -rf *.a *.so *.o *.rpm $(LIB) *~ $(DEPS) xen
    1.36  
    1.37  rpm: all
    1.38  	rm -rf staging
    1.39 @@ -87,17 +85,11 @@ rpm: all
    1.40  	mv staging/i386/*.rpm .
    1.41  	rm -rf staging
    1.42  
    1.43 -$(PIC_OBJS): %.opic: %.c
    1.44 -	$(CC) $(CPPFLAGS) -DPIC $(CFLAGS) -fPIC -c -o $@ $<
    1.45 -
    1.46 -$(LIB_NAME).a: $(OBJS)
    1.47 -	$(AR) rc $@ $^
    1.48 -
    1.49 -$(LIB_NAME).so: $(LIB_NAME).so.$(MAJOR)
    1.50 -	ln -sf $< $@
    1.51 -$(LIB_NAME).so.$(MAJOR): $(LIB_NAME).so.$(MAJOR).$(MINOR)
    1.52 -	ln -sf $< $@
    1.53 -$(LIB_NAME).so.$(MAJOR).$(MINOR): $(PIC_OBJS)
    1.54 +libxc.so:
    1.55 +	ln -sf libxc.so.$(MAJOR) $@
    1.56 +libxc.so.$(MAJOR):
    1.57 +	ln -sf libxc.so.$(MAJOR).$(MINOR) $@
    1.58 +libxc.so.$(MAJOR).$(MINOR): $(OBJS)
    1.59  	$(CC) -Wl,-soname -Wl,$(SONAME) -shared -o $@ $^ -L../libxutil -lxutil -lz
    1.60  
    1.61  -include $(DEPS)

     2.1 --- a/tools/libxutil/Makefile	Tue Jan 25 15:37:49 2005 +0000
     2.2 +++ b/tools/libxutil/Makefile	Tue Jan 25 15:59:28 2005 +0000
     2.3 @@ -24,7 +24,6 @@ LIB_SRCS += sys_string.c
     2.4  LIB_SRCS += util.c
     2.5  
     2.6  LIB_OBJS := $(LIB_SRCS:.c=.o)
     2.7 -LIB_PIC_OBJS := $(LIB_SRCS:.c=.opic)
     2.8  
     2.9  CFLAGS   += -Wall
    2.10  CFLAGS   += -Werror
    2.11 @@ -39,7 +38,6 @@ DEPS     = .*.d
    2.12  MAJOR    := 2.0
    2.13  MINOR    := 0
    2.14  LIB_NAME := libxutil
    2.15 -SO_NAME  := $(LIB_NAME).so.$(MAJOR)
    2.16  LIB      := $(LIB_NAME).so 
    2.17  LIB      += $(LIB_NAME).so.$(MAJOR)
    2.18  LIB      += $(LIB_NAME).so.$(MAJOR).$(MINOR)
    2.19 @@ -48,17 +46,14 @@ LIB      += $(LIB_NAME).a
    2.20  all: check-for-zlib
    2.21  	$(MAKE) $(LIB)
    2.22  
    2.23 -$(LIB_PIC_OBJS): %.opic: %.c
    2.24 -	$(CC) $(CPPFLAGS) -DPIC $(CFLAGS) -fPIC -c -o $@ $<
    2.25 -
    2.26  $(LIB_NAME).so: $(LIB_NAME).so.$(MAJOR)
    2.27  	ln -sf $^ $@
    2.28  
    2.29  $(LIB_NAME).so.$(MAJOR): $(LIB_NAME).so.$(MAJOR).$(MINOR)
    2.30  	ln -sf $^ $@
    2.31  
    2.32 -$(LIB_NAME).so.$(MAJOR).$(MINOR): $(LIB_PIC_OBJS)
    2.33 -	$(CC) -Wl,-soname -Wl,$(SO_NAME) -shared -o $@ $^
    2.34 +$(LIB_NAME).so.$(MAJOR).$(MINOR): $(LIB_OBJS)
    2.35 +	$(CC) -Wl,-soname -Wl,$(LIB_NAME).so.$(MAJOR) -shared -o $@ $^
    2.36  
    2.37  $(LIB_NAME).a: $(LIB_OBJS)
    2.38  	$(AR) rc $@ $^
    2.39 @@ -78,7 +73,7 @@ install: all
    2.40  	ln -sf $(LIB_NAME).so.$(MAJOR) $(DESTDIR)/usr/lib/$(LIB_NAME).so
    2.41  
    2.42  clean:
    2.43 -	$(RM) *.a *.so *.so.* *.o *.opic *.rpm 
    2.44 +	$(RM) *.a *.so *.so.* *.o *.rpm 
    2.45  	$(RM) *~
    2.46  	$(RM) $(DEPS)
    2.47