Репозитории ALT
S: | 1.2.0cvs-alt7 |
5.1: | 1.2.0cvs-alt2.1 |
4.1: | 1.2.0cvs-alt1 |
4.0: | 1.2.0-alt1.0 |
3.0: | 1.1.14-alt2 |
Группа :: Разработка/Прочее
Пакет: libclip
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: libclip-1.2.0cvs-alt-linking.patch
Скачать
Скачать
diff --git a/libclip/clip-com/Makefile b/libclip/clip-com/Makefile
index 5fab40e..59aca3d 100644
--- a/libclip/clip-com/Makefile
+++ b/libclip/clip-com/Makefile
@@ -22,7 +22,7 @@ have_lib:
# test -f /usr/include/bzlib.h
$(TARGET): $(OBJS) $(LIBEZ)
- $(CLIPROOT)/bin/clip_makeslib $(TARGET) $(OBJS) $(LIBEZ)
+ $(CLIPROOT)/bin/clip_makeslib $(TARGET) $(OBJS) $(LIBEZ) -L${CLIPROOT}/lib -lclip
$(ATARGET): $(OBJS) $(LIBEZ)
$(CLIPROOT)/bin/clip_makelib $(ATARGET) $(OBJS) $(LIBEZ)
diff --git a/libclip/clip-gd/Makefile b/libclip/clip-gd/Makefile
index 40f5adc..f625993 100644
--- a/libclip/clip-gd/Makefile
+++ b/libclip/clip-gd/Makefile
@@ -21,7 +21,7 @@ build_gd:
cd bsgraphic && $(MAKE)
rm -f $(XLIB)
$(CLIPROOT)/bin/clip_makelib $(XLIB) _gd.o gd_obj.o ./bsgraphic/*.o
- ./makegd.sh $(XLIB)
+ CLIPROOT=${CLIPROOT} ./makegd.sh $(XLIB)
touch build_gd
install:
diff --git a/libclip/clip-gd/makegd.sh b/libclip/clip-gd/makegd.sh
index e4841df..87839e7 100755
--- a/libclip/clip-gd/makegd.sh
+++ b/libclip/clip-gd/makegd.sh
@@ -12,7 +12,7 @@ XLIB=libclip-gd.a
name=libclip-gd${DLLSUFF}
[ -z "$1" ] || name="$1"
-LIBS="-lz -lm $LIBPNG $LIBJPEG $LIBFREETYPE $LIBTTF $LIBXPM"
+LIBS="-lz -lm $LIBPNG $LIBJPEG $LIBFREETYPE $LIBTTF $LIBXPM -L${CLIPROOT}/lib -lclip"
#CFLAGS='-L/usr/X11R6/lib'
CFLAGS="$LIBDIRS"
diff --git a/libclip/clip-glade2/Makefile b/libclip/clip-glade2/Makefile
index e1576a9..d866272 100644
--- a/libclip/clip-glade2/Makefile
+++ b/libclip/clip-glade2/Makefile
@@ -18,7 +18,7 @@ CFLAGS = $(C_FLAGS) `pkg-config --cflags libglade-2.0` -I../clip-gtk2
OBJS=clip_glade.o
-LIBS=`pkg-config --libs libglade-2.0` $(C_LIBS)
+LIBS=`pkg-config --libs libglade-2.0` $(C_LIBS) ../clip-gtk2/libclip-gtk2.so
XLIB=libclip-glade2.a
XSLIB=libclip-glade2$(DLLSUFF)