rpms/synaptics/devel synaptics-0.14.4-modularx.patch, 1.3, 1.4 synaptics.spec, 1.19, 1.20

[fedora-cvs-commits at redhat.com]

Author: krh

Update of /cvs/dist/rpms/synaptics/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22361

Modified Files:
	synaptics-0.14.4-modularx.patch synaptics.spec 
Log Message:
* Tue Apr 11 2006 Kristian Høgsberg <krh at redhat.com> 0:0.14.4-6
- Build as a shared object.


synaptics-0.14.4-modularx.patch:
 Makefile |   25 ++++++++++++-------------
 1 files changed, 12 insertions(+), 13 deletions(-)

Index: synaptics-0.14.4-modularx.patch
===================================================================
RCS file: /cvs/dist/rpms/synaptics/devel/synaptics-0.14.4-modularx.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- synaptics-0.14.4-modularx.patch	18 Nov 2005 21:02:34 -0000	1.3
+++ synaptics-0.14.4-modularx.patch	11 Apr 2006 20:18:05 -0000	1.4
@@ -1,5 +1,5 @@
 --- synaptics-0.14.4/Makefile.modx	2005-11-06 10:29:18.000000000 -0500
-+++ synaptics-0.14.4/Makefile	2005-11-18 15:58:44.000000000 -0500
++++ synaptics-0.14.4/Makefile	2006-04-11 16:16:00.000000000 -0400
 @@ -7,7 +7,7 @@
  # Define the TOP variable to build using include files from a local source tree.
  #TOP = /usr/src/redhat/BUILD/XFree86-4.3.0/xc
@@ -22,21 +22,59 @@
  else
    SERVERSRC = $(TOP)/programs/Xserver
    ALLINCLUDES = -I. \
-@@ -80,7 +80,7 @@
+@@ -60,16 +60,15 @@
  
- all:: synaptics_drv.o synclient syndaemon
+ check_gcc = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;)
+ 
+-CCOPTIONS := -pedantic -Wall -Wpointer-arith
++CCOPTIONS := -pedantic -Wall -Wpointer-arith -fPIC
+ CCOPTIONS += $(call check_gcc,-fno-merge-constants,)
+-CCOPTIONS += $(call check_gcc,-fno-pic,)
+ CDEBUGFLAGS = -O2
+ CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(ALLDEFINES) -DVERSION="\"$(VERSION)\"" -DVERSION_ID="$(VERSION_ID)"
+ CFLAGSCLIENT = $(CDEBUGFLAGS) $(CCOPTIONS) -DVERSION="\"$(VERSION)\""  -DVERSION_ID="$(VERSION_ID)" -I$(X_INCLUDES_ROOT)/include
+ 
+ CC = gcc
+ 
+-LDCOMBINEFLAGS = -r
++LDCOMBINEFLAGS = -shared -fPIC
+ 
+ SRCS = synaptics.c ps2comm.c eventcomm.c psmcomm.c alpscomm.c
+ OBJS = synaptics.o ps2comm.o eventcomm.o psmcomm.o alpscomm.o
+@@ -78,9 +77,9 @@
+ 	$(RM) $@
+ 	$(CC) -c $(CFLAGS) $(_NOOP_) $*.c
+ 
+-all:: synaptics_drv.o synclient syndaemon
++all:: synaptics_drv.so synclient syndaemon
  
 -install: $(BINDIR)/synclient $(BINDIR)/syndaemon $(INSTALLED_X)/$(LIBDIR)/modules/input/synaptics_drv.o install-man
-+install: $(BINDIR)/synclient $(BINDIR)/syndaemon $(INSTALLED_X)/$(LIBDIR)/xorg/modules/input/synaptics_drv.o install-man
++install: $(BINDIR)/synclient $(BINDIR)/syndaemon $(INSTALLED_X)/$(LIBDIR)/xorg/modules/input/synaptics_drv.so install-man
  
  install-man: $(MANDIR)/man1/synclient.1 $(MANDIR)/man1/syndaemon.1 $(MANDIR)/man5/synaptics.5
  
-@@ -99,7 +99,7 @@
+@@ -99,12 +98,12 @@
  $(BINDIR)/syndaemon : syndaemon
  	install -D $< $@
  
 -$(INSTALLED_X)/$(LIBDIR)/modules/input/synaptics_drv.o : synaptics_drv.o
-+$(INSTALLED_X)/$(LIBDIR)/xorg/modules/input/synaptics_drv.o : synaptics_drv.o
++$(INSTALLED_X)/$(LIBDIR)/xorg/modules/input/synaptics_drv.so : synaptics_drv.so
  	install --mode=0644 -D $< $@
  
- synaptics_drv.o: $(OBJS)
+-synaptics_drv.o: $(OBJS)
++synaptics_drv.so: $(OBJS)
+ 	$(RM) $@
+-	$(LD) $(LDCOMBINEFLAGS)  $(OBJS) -o $@
++	$(CC) $(LDCOMBINEFLAGS)  $(OBJS) -o $@
+ 
+ synclient.o	: synclient.c
+ 	$(CC) $(CFLAGSCLIENT) -c -o $@ $<
+@@ -133,7 +132,7 @@
+ 	etags -o TAGS *.c *.h
+ 
+ uninstall::
+-	$(RM) $(BINDIR)/synclient $(BINDIR)/syndaemon $(INSTALLED_X)/lib/modules/input/synaptics_drv.o $(MANDIR)/man1/synclient.1 $(MANDIR)/man1/syndaemon.1 $(MANDIR)/man5/synaptics.5
++	$(RM) $(BINDIR)/synclient $(BINDIR)/syndaemon $(INSTALLED_X)/lib/modules/input/synaptics_drv.so $(MANDIR)/man1/synclient.1 $(MANDIR)/man1/syndaemon.1 $(MANDIR)/man5/synaptics.5
+ 
+ distribution : synaptics-$(VERSION).tar.bz2
+ 


Index: synaptics.spec
===================================================================
RCS file: /cvs/dist/rpms/synaptics/devel/synaptics.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- synaptics.spec	10 Apr 2006 18:44:23 -0000	1.19
+++ synaptics.spec	11 Apr 2006 20:18:05 -0000	1.20
@@ -3,7 +3,7 @@
 Name:           synaptics
 Version:        0.14.4
 Epoch:		0
-Release:	5
+Release:	6
 Summary:        Synaptics Touchpad Driver
 
 Group:          User Interface/X Hardware Support
@@ -48,7 +48,7 @@
 rm -rf Xincludes
 
 %build
-make ARCH=%{_arch} synaptics_drv.o synclient syndaemon
+make ARCH=%{_arch} synaptics_drv.so synclient syndaemon
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -70,6 +70,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Tue Apr 11 2006 Kristian Høgsberg <krh at redhat.com> 0:0.14.4-6
+- Build as a shared object.
+
 * Mon Apr 10 2006 Adam Jackson <ajackson at redhat.com 0:0.14.4-5
 - Delibcwrap and rebuild for 7.1RC1 ABI.