sync XF4.4
This commit is contained in:
parent
6cd3af4649
commit
2c63dc60da
@ -1,30 +0,0 @@
|
||||
$OpenBSD: patch-kxkb_Makefile_in,v 1.3 2004/02/01 14:59:22 espie Exp $
|
||||
--- kxkb/Makefile.in.orig 2004-01-18 14:19:56.000000000 +0100
|
||||
+++ kxkb/Makefile.in 2004-01-21 01:31:57.000000000 +0100
|
||||
@@ -479,7 +479,7 @@ kcm_keyboard_la_SOURCES=rules.cpp kcmlay
|
||||
#>- kcm_keyboard_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
|
||||
#>+ 1
|
||||
kcm_keyboard_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(KDE_NO_UNDEFINED)
|
||||
-kcm_keyboard_la_LIBADD = $(XTESTLIB) $(LIB_KIO) -lxkbfile
|
||||
+kcm_keyboard_la_LIBADD = $(XTESTLIB) $(LIB_KIO) -lxkbfile_pic
|
||||
|
||||
#kxkb_la_includedir = .
|
||||
#kxkb_la_include_HEADERS = kxkb.h
|
||||
@@ -488,7 +488,7 @@ kcm_keyboard_la_LIBADD = $(XTESTLIB) $(L
|
||||
kxkb_la_SOURCES = kxkb_la_dummy.cpp
|
||||
libkdeinit_kxkb_la_SOURCES = kxkb.cpp rules.cpp extension.cpp pixmap.cpp kxkb_skel.cpp
|
||||
kxkb_la_LDFLAGS = $(all_libraries) -module -avoid-version
|
||||
-#>- kxkb_la_LIBADD = -lX11 -lXext $(LIB_KDEUI) -lxkbfile
|
||||
+#>- kxkb_la_LIBADD = -lX11 -lXext $(LIB_KDEUI) -lxkbfile_pic
|
||||
#>+ 1
|
||||
kxkb_la_LIBADD = libkdeinit_kxkb.la
|
||||
|
||||
@@ -1120,7 +1120,7 @@ messages: rc.cpp
|
||||
.NOEXPORT:
|
||||
|
||||
#>+ 2
|
||||
-libkdeinit_kxkb_la_LIBADD = -lX11 -lXext $(LIB_KDEUI) -lxkbfile
|
||||
+libkdeinit_kxkb_la_LIBADD = -lX11 -lXext $(LIB_KDEUI) -lxkbfile_pic
|
||||
|
||||
#>+ 2
|
||||
libkdeinit_kxkb_la_LDFLAGS = -avoid-version $(all_libraries)
|
Loading…
x
Reference in New Issue
Block a user