Группа :: Звук
Пакет: nted
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: nted-linking.patch
Скачать
Скачать
--- configure.in.orig 2008-05-28 18:23:33 +0400
+++ configure.in 2008-06-09 19:05:35 +0400
@@ -142,9 +142,9 @@ dnl AC_CHECK_PROGS(IMAGE2HEADER, gdk-pix
if test "X$conf_dir" = "X"
then
- cairocompilecommand="$CXX $CXXFLAGS \`pkg-config --cflags gtk+-2.0\` \`pkg-config --libs gtk+-2.0\` cairotest.c -o cairotest $LDFLAGS"
+ cairocompilecommand="$CXX $CXXFLAGS \`pkg-config --cflags gtk+-2.0\` cairotest.c -o cairotest $LDFLAGS \`pkg-config --libs gtk+-2.0\` "
else
- cairocompilecommand="export PKG_CONFIG_PATH=$conf_dir;$CXX $CXXFLAGS \`pkg-config --cflags gtk+-2.0\` \`pkg-config --libs gtk+-2.0\` cairotest.c -o cairotest $LDFLAGS"
+ cairocompilecommand="export PKG_CONFIG_PATH=$conf_dir;$CXX $CXXFLAGS \`pkg-config --cflags gtk+-2.0\` cairotest.c -o cairotest $LDFLAGS \`pkg-config --libs gtk+-2.0\`"
fi
rm -f cairotest.c cairotest.o
--- configure.in.orig 2008-06-09 19:06:22 +0400
+++ configure.in 2008-06-09 19:07:27 +0400
@@ -79,7 +79,7 @@ fi
extra_config_path=0
-gtkcompilecommand="$CXX $CXXFLAGS \`pkg-config --cflags cairo gtk+-2.0\` \`pkg-config --libs cairo gtk+-2.0\` gtktest.c -o gtktest $LDFLAGS"
+gtkcompilecommand="$CXX $CXXFLAGS \`pkg-config --cflags cairo gtk+-2.0\` gtktest.c -o gtktest $LDFLAGS \`pkg-config --libs cairo gtk+-2.0\`"
dnl if test "X$with_gtk2conf" != "X" -o \( ! -f /usr/lib/pkgconfig/gtk+-2.0.pc \)
dnl then
dnl if test "X$with_gtk2conf" = "X"
--- configure.in.orig 2008-06-09 19:23:33 +0400
+++ configure.in 2008-06-09 19:23:22 +0400
@@ -368,10 +368,13 @@ fi
AC_DEFINE_UNQUOTED([VERSIONSTRING], ["$VERSION"], [The version string])
+COMMON_LIBS=`pkg-config --libs cairo pango gtk+-2.0`
+
AC_SUBST(YELP)
AC_SUBST(DEBUGFLAG)
AC_SUBST(IMAGE2HEADER)
AC_SUBST(FREETYPE_INCLUDE)
+AC_SUBST(COMMON_LIBS)
AC_SUBST(MAKE_WITH_ENV)
AC_CONFIG_HEADERS([config.h])
AC_OUTPUT([Makefile commands/Makefile dialogs/Makefile icons/Makefile po/Makefile datafiles/Makefile man/Makefile doc/Makefile doc/templates/Makefile
--- Makefile.am.orig 2008-05-27 13:13:59 +0400
+++ Makefile.am 2008-06-09 19:13:27 +0400
@@ -26,8 +26,6 @@ endif
FREETYPE_INCLUDE = @FREETYPE_INCLUDE@
SUBDIRS = commands dialogs icons po datafiles $(DOCSDIR) man
-AM_CPPFLAGS = -DDATADIR=\"$(datadir)\" -DLOCALEDIR=\"$(localedir)\" $(FREETYPE_INCLUDE) -I./dialogs -I./commands `pkg-config --cflags cairo gtk+-2.0`
-AM_LDFLAGS =`pkg-config --libs cairo pango gtk+-2.0` -lasound
if EXTRA_ENV
MAKE = @MAKE_WITH_ENV@
@@ -42,7 +40,8 @@ nted_SOURCES = mainwindow.cpp resource.c
line3.cpp acceleration.cpp freetext.cpp freesign.cpp midiimporter.cpp \
instrumenttable.cpp importer.cpp
-nted_LDADD = commands/libcommands.a dialogs/libdialogs.a
+nted_CPPFLAGS = -DDATADIR=\"$(datadir)\" -DLOCALEDIR=\"$(localedir)\" $(FREETYPE_INCLUDE) -I./dialogs -I./commands `pkg-config --cflags cairo gtk+-2.0`
+nted_LDADD = commands/libcommands.a dialogs/libdialogs.a $(COMMON_LIBS) -lasound
distclean: clean
rm -f Makefile commands/Makefile datafiles/Makefile dialogs/Makefile icons/Makefile