[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog gui/Makefile.am
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] gnash ChangeLog gui/Makefile.am |
Date: |
Wed, 16 May 2007 07:14:00 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/05/16 07:14:00
Modified files:
. : ChangeLog
gui : Makefile.am
Log message:
* gui/Makefile.am: don't put LDFLAGS in LIBADD, remove
spurious character likely slipped in due to Markus
fighting with his new keyboard ;)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3235&r2=1.3236
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.72&r2=1.73
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3235
retrieving revision 1.3236
diff -u -b -r1.3235 -r1.3236
--- ChangeLog 15 May 2007 22:28:53 -0000 1.3235
+++ ChangeLog 16 May 2007 07:14:00 -0000 1.3236
@@ -1,3 +1,9 @@
+2007-05-16 Sandro Santilli <address@hidden>
+
+ * gui/Makefile.am: don't put LDFLAGS in LIBADD, remove
+ spurious character likely slipped in due to Markus
+ fighting with his new keyboard ;)
+
2007-05-15 Markus Gothe <address@hidden>
* po/se.po: Initial start of Swedish translation.
Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -b -r1.72 -r1.73
--- gui/Makefile.am 15 May 2007 22:11:12 -0000 1.72
+++ gui/Makefile.am 16 May 2007 07:14:00 -0000 1.73
@@ -17,7 +17,7 @@
#
-# $Id: Makefile.am,v 1.72 2007/05/15 22:11:12 nihilus Exp $
+# $Id: Makefile.am,v 1.73 2007/05/16 07:14:00 strk Exp $
AUTOMAKE_OPTIONS =
localedir = $(datadir)/locale
@@ -85,7 +85,7 @@
if USE_GUI_SDL
SDL_OPENGL_SRCS = sdl_ogl_glue.cpp sdl_ogl_glue.h
endif # USE_GUI_SDL
-Âif USE_GUI_KDE
+if USE_GUI_KDE
KDE_OPENGL_SRCS = kde_glue_opengl.cpp kde_glue_opengl.h
AM_CPPFLAGS += $(KDE_CFLAGS) $(QT_CFLAGS)
AM_LDFLAGS += $(KDE_LIBS) $(QT_LIBS)
@@ -216,7 +216,13 @@
libgnashgui_la_LIBADD = \
$(top_builddir)/server/libgnashserver.la \
$(top_builddir)/backend/libgnashbackend.la \
- $(top_builddir)/libamf/libgnashamf.la \
+ $(top_builddir)/libamf/libgnashamf.la
+
+# is LDFLAGS still needed when AM_LDFLAGS is defined already ?
+libgnashgui_la_LDFLAGS = \
+ -release $(VERSION) \
+ -no-undefined \
+ -export-dynamic \
$(AM_LDFLAGS)
if USE_GUI_KDE
@@ -241,7 +247,12 @@
libgnashplayer_la_LIBADD = \
$(top_builddir)/server/libgnashserver.la \
$(top_builddir)/backend/libgnashbackend.la \
- libgnashgui.la \
+ libgnashgui.la
+
+libgnashplayer_la_LDFLAGS = \
+ -release $(VERSION) \
+ -no-undefined \
+ -export-dynamic \
$(AM_LDFLAGS)
gnash_SOURCES = gnash.cpp
@@ -283,8 +294,6 @@
#guitest_SOURCES = guitest.cpp #fltk.cpp #fltksup.h fltksupp.h gnash.cpp
gtk.cpp
# gtksup.h gui.cpp gui.h menu.cpp menu.h sdl.cpp sdlsup.h [21~sdlsupp.h
#guitest_LDADD = $(gnash_LDADD)
-libgnashplayer_la_LDFLAGS = -release $(VERSION) -no-undefined -export-dynamic
-libgnashgui_la_LDFLAGS = -release $(VERSION) -no-undefined -export-dynamic
# Rebuild with GCC 4.x Mudflap support
mudflap: