91 lines
5.6 KiB
Diff
91 lines
5.6 KiB
Diff
|
diff -pruN CASA-1.6.659.orig/c_adlib/ad_ff/native/Makefile.am CASA-1.6.659/c_adlib/ad_ff/native/Makefile.am
|
||
|
|
--- CASA-1.6.659.orig/c_adlib/ad_ff/native/Makefile.am 2007-02-05 14:32:12.000000000 +0100
|
||
|
|
+++ CASA-1.6.659/c_adlib/ad_ff/native/Makefile.am 2007-02-05 14:35:28.000000000 +0100
|
||
|
|
@@ -68,7 +68,7 @@ LIBS = -lpthread -ldl -L/opt/kde3/lib
|
||
|
|
LDFLAGS = -fno-exception -fno-check-new -Wl,-Bsymbolic -shared -pthread -O2 \
|
||
|
|
-Wl,-soname -Wl,libkwallets_rw.so.1
|
||
|
|
|
||
|
|
-EXTRA_LDFLAGS = -L/usr/$(LIB) -lqt-mt -L/usr/X11R6/$(LIB) -L/usr/lib/qt3/$(LIB)
|
||
|
|
+EXTRA_LDFLAGS = -L/usr/$(LIB) -lqt-mt -L/usr/X11R6/$(LIB) -L/usr/qt/3/$(LIB)
|
||
|
|
|
||
|
|
OBJDIR = ./$(TARGET_CFG)/$(LIB)
|
||
|
|
|
||
|
|
diff -pruN CASA-1.6.659.orig/c_adlib/ad_ff/native/Makefile.in CASA-1.6.659/c_adlib/ad_ff/native/Makefile.in
|
||
|
|
--- CASA-1.6.659.orig/c_adlib/ad_ff/native/Makefile.in 2007-02-05 14:32:12.000000000 +0100
|
||
|
|
+++ CASA-1.6.659/c_adlib/ad_ff/native/Makefile.in 2007-02-05 14:35:28.000000000 +0100
|
||
|
|
@@ -235,7 +235,7 @@ EXTRA_CXXFLAGS = -fPIC -DPIC -DSSCS_LINU
|
||
|
|
-DALIGNMENT -DN_PLAT_UNIX -DUNIX -DLINUX -DIAPX386
|
||
|
|
|
||
|
|
CXX_RESOURCES =
|
||
|
|
-EXTRA_LDFLAGS = -L/usr/$(LIB) -lqt-mt -L/usr/X11R6/$(LIB) -L/usr/lib/qt3/$(LIB)
|
||
|
|
+EXTRA_LDFLAGS = -L/usr/$(LIB) -lqt-mt -L/usr/X11R6/$(LIB) -L/usr/qt/3/$(LIB)
|
||
|
|
OBJDIR = ./$(TARGET_CFG)/$(LIB)
|
||
|
|
OBJS = $(addprefix $(OBJDIR)/, $(CXXFILES:%.cpp=%.o))
|
||
|
|
CUR_DIR := $(shell pwd)
|
||
|
|
diff -pruN CASA-1.6.659.orig/c_adlib/ad_kw/native/link.lux CASA-1.6.659/c_adlib/ad_kw/native/link.lux
|
||
|
|
--- CASA-1.6.659.orig/c_adlib/ad_kw/native/link.lux 2007-02-05 14:17:50.000000000 +0100
|
||
|
|
+++ CASA-1.6.659/c_adlib/ad_kw/native/link.lux 2007-02-05 14:35:28.000000000 +0100
|
||
|
|
@@ -7,7 +7,7 @@ LINK = $(CPP) \
|
||
|
|
-L/usr/lib$(ARC) -lpthread -lc -ldl \
|
||
|
|
-L/opt/kde3/lib$(ARC) -lkwalletclient -lqt-mt \
|
||
|
|
-L/usr/X11R6/lib$(ARC) \
|
||
|
|
- -L/usr/lib/qt3/lib$(ARC) -lqt-mt \
|
||
|
|
+ -L/usr/qt/3/lib$(ARC) -lqt-mt \
|
||
|
|
-Wl,-soname -Wl,lib$(TARGET).so.$(PROD_NUM) \
|
||
|
|
-o $(LIBDIR)$(XTRA)/lib$(TARGET).so.$(BLD_VER) \
|
||
|
|
-L$(LIBDIR)$(XTRA) \
|
||
|
|
diff -pruN CASA-1.6.659.orig/c_adlib/ad_kw/native/Makefile.am CASA-1.6.659/c_adlib/ad_kw/native/Makefile.am
|
||
|
|
--- CASA-1.6.659.orig/c_adlib/ad_kw/native/Makefile.am 2007-02-05 14:32:12.000000000 +0100
|
||
|
|
+++ CASA-1.6.659/c_adlib/ad_kw/native/Makefile.am 2007-02-05 14:35:28.000000000 +0100
|
||
|
|
@@ -44,7 +44,7 @@ PLATFORMINDEPENDENTSOURCEDIR =
|
||
|
|
PLATFORMDEPENDENTSOURCEDIR = .
|
||
|
|
|
||
|
|
####this needs to be defined in configure.in
|
||
|
|
-MOC = /usr/lib/qt3/bin/moc
|
||
|
|
+MOC = /usr/qt/3/bin/moc
|
||
|
|
CXX = g++
|
||
|
|
|
||
|
|
MODULE_NAME =libkwallets_rw
|
||
|
|
@@ -56,7 +56,7 @@ CXX_MOC_FILES = kwallets_rw.moc
|
||
|
|
|
||
|
|
CXXFILES_CXX :=
|
||
|
|
INCLUDES = -I. -I.. -I$(CASAROOT)/include \
|
||
|
|
--I/opt/kde3/include -I/usr/lib/qt3/include -I/usr/X11R6/include -I/usr/include/gnome-keyring-1/
|
||
|
|
+-I/opt/kde3/include -I/usr/qt/3/include -I/usr/X11R6/include -I/usr/include/gnome-keyring-1/
|
||
|
|
CXXFLAGS = $(CPP_LIBFLAG) $(INCLUDES)
|
||
|
|
EXTRA_CXXFLAGS = -fPIC -DPIC -DSSCS_LINUX_PLAT_F -DQT_THREAD_SUPPORT -DQT_CLEAN_NANESPACE \
|
||
|
|
-DQT_NO_ASCII_CAS -O2 -fmessage-length=0 -Wall -g -D_REENTRANT \
|
||
|
|
@@ -67,7 +67,7 @@ LDFLAGS = -fno-exception -fno-check-new
|
||
|
|
-Wl,-soname -Wl,libkwallets_rw.so.1
|
||
|
|
|
||
|
|
EXTRA_LDFLAGS = -L/opt/kde3/$(LIB) -lkwalletclient \
|
||
|
|
- -lqt-mt -L/usr/X11R6/$(LIB) -L/usr/lib/qt3/$(LIB) -lqt-mt
|
||
|
|
+ -lqt-mt -L/usr/X11R6/$(LIB) -L/usr/qt/3/$(LIB) -lqt-mt
|
||
|
|
|
||
|
|
OBJDIR = ./$(TARGET_CFG)/$(LIB)
|
||
|
|
|
||
|
|
diff -pruN CASA-1.6.659.orig/shsrc/lshsrc/mk-micasa_kw-dl CASA-1.6.659/shsrc/lshsrc/mk-micasa_kw-dl
|
||
|
|
--- CASA-1.6.659.orig/shsrc/lshsrc/mk-micasa_kw-dl 2007-02-05 14:17:50.000000000 +0100
|
||
|
|
+++ CASA-1.6.659/shsrc/lshsrc/mk-micasa_kw-dl 2007-02-05 14:35:28.000000000 +0100
|
||
|
|
@@ -24,7 +24,7 @@ fi
|
||
|
|
#(ln -f $COMMON_FILES $PR/c_micasadk)
|
||
|
|
cd $PR/c_adlib/ad_kw/native
|
||
|
|
moc kwallets_rw.h -o kwallets_rw.moc
|
||
|
|
-(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MODULE=shared MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=dbg XTRA_CFLAGS="-I/opt/kde3/include -I/usr/lib/qt3/include -I/usr/X11R6/include -DSSCS_LINUX_PLAT_F -DQT_THREAD_SUPPORT -DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAS -DDEBUG -g" $2 $3 $4 $5)
|
||
|
|
+(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MODULE=shared MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=dbg XTRA_CFLAGS="-I/opt/kde3/include -I/usr/qt/3/include -I/usr/X11R6/include -DSSCS_LINUX_PLAT_F -DQT_THREAD_SUPPORT -DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAS -DDEBUG -g" $2 $3 $4 $5)
|
||
|
|
RCODE=$?
|
||
|
|
rm kwallets_rw.moc
|
||
|
|
rm -f $COMMON_FILES
|
||
|
|
diff -pruN CASA-1.6.659.orig/shsrc/lshsrc/mk-micasa_kw-ol CASA-1.6.659/shsrc/lshsrc/mk-micasa_kw-ol
|
||
|
|
--- CASA-1.6.659.orig/shsrc/lshsrc/mk-micasa_kw-ol 2007-02-05 14:17:50.000000000 +0100
|
||
|
|
+++ CASA-1.6.659/shsrc/lshsrc/mk-micasa_kw-ol 2007-02-05 14:35:28.000000000 +0100
|
||
|
|
@@ -24,7 +24,7 @@ fi
|
||
|
|
#(ln -f $COMMON_FILES $PR/c_micasadk)
|
||
|
|
cd $PR/c_adlib/ad_kw/native
|
||
|
|
moc kwallets_rw.h -o kwallets_rw.moc
|
||
|
|
-(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MODULE=shared MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=ndbg XTRA_CFLAGS="-I/opt/kde3/include -I/usr/lib/qt3/include -I/usr/X11R6/include -DSSCS_LINUX_PLAT_F -DQT_THREAD_SUPPORT -DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAS -O2 -fmessage-length=0 -Wall -fstack-protector -g" $2 $3 $4 $5)
|
||
|
|
+(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MODULE=shared MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=ndbg XTRA_CFLAGS="-I/opt/kde3/include -I/usr/qt/3/include -I/usr/X11R6/include -DSSCS_LINUX_PLAT_F -DQT_THREAD_SUPPORT -DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAS -O2 -fmessage-length=0 -Wall -fstack-protector -g" $2 $3 $4 $5)
|
||
|
|
RCODE=$?
|
||
|
|
rm -f $COMMON_FILES
|
||
|
|
rm kwallets_rw.moc
|