[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: |
Fri, 06 Oct 2006 12:42:01 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 06/10/06 12:42:01
Modified files:
. : ChangeLog
gui : Makefile.am
Log message:
don't link against unecessary libs
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1048&r2=1.1049
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.21&r2=1.22
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1048
retrieving revision 1.1049
diff -u -b -r1.1048 -r1.1049
--- ChangeLog 6 Oct 2006 09:22:08 -0000 1.1048
+++ ChangeLog 6 Oct 2006 12:42:01 -0000 1.1049
@@ -1,7 +1,7 @@
2006-10-06 Sandro Santilli <address@hidden>
+ * gui/Makefile.am: don't link against unecessary libs
* backend/Makefile.am: don't link against unecessary libs
- ( unfinished )
2006-10-06 Hannes Mayr <address@hidden>
Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- gui/Makefile.am 3 Oct 2006 15:40:50 -0000 1.21
+++ gui/Makefile.am 6 Oct 2006 12:42:01 -0000 1.22
@@ -38,78 +38,88 @@
AUTOMAKE_OPTIONS =
+INCLUDES = -I.. \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/server \
+ -I$(top_srcdir)/server/parser \
+ -I$(top_srcdir)/libbase \
+ -I$(top_srcdir)/backend \
+ -I$(top_srcdir)/libgeometry \
+ $(PTHREAD_CFLAGS) \
+ $(SDL_CFLAGS) \
+ $(SDL_MIXER_CFLAGS) \
+ $(PANGO_CFLAGS) \
+ $(GLIB_CFLAGS) \
+ $(ATK_CFLAGS) \
+ $(DMALLOC_CFLAGS) \
+ $(PNG_CFLAGS) \
+ $(JPEG_CFLAGS) \
+ $(MP3_CFLAGS) \
+ $(OGG_CFLAGS) \
+ $(BOOST_CFLAGS)
+
+## WARNING: make sure GLIB_LIBS appears first
+## See: http://lists.gnu.org/archive/html/gnash-dev/2006-07/msg00076.html
+AM_LDFLAGS = \
+ $(GLIB_LIBS) \
+ $(PANGO_LIBS) \
+ $(BOOST_LIBS) \
+ $(PTHREAD_LIBS)
+
+
if USE_RENDERER_OPENGL
-if USE_GUI_GTK
-GTK_OPENGL_SRCS = gtk_glue_gtkglext.cpp gtk_glue_gtkglext.h
-endif # USE_GUI_GTK
-if USE_GUI_KDE
-KDE_OPENGL_SRCS = kde_glue_opengl.cpp kde_glue_opengl.h
-endif # USE_GUI_KDE
+ INCLUDES += $(OPENGL_CFLAGS)
+ if USE_GUI_GTK
+ AM_LDFLAGS += $(GLEXT_LIBS)
+ INCLUDES += $(GLEXT_CFLAGS)
+ GTK_OPENGL_SRCS = gtk_glue_gtkglext.cpp gtk_glue_gtkglext.h
+ endif # USE_GUI_GTK
+ if USE_GUI_KDE
+ KDE_OPENGL_SRCS = kde_glue_opengl.cpp kde_glue_opengl.h
+ endif # USE_GUI_KDE
else # ! USE_RENDERER_OPENGL
-GTK_OPENGL_SRCS =
-KDE_OPENGL_SRCS =
+ GTK_OPENGL_SRCS =
+ KDE_OPENGL_SRCS =
endif # ! USE_RENDERER_OPENGL
if USE_RENDERER_CAIRO
-GTK_CAIRO_SRCS = gtk_glue_cairo.cpp gtk_glue_cairo.h
-KDE_CAIRO_SRCS = #kde_glue_cairo.cpp kde_glue_cairo.h
+ INCLUDES += $(CAIRO_CFLAGS)
+ AM_LDFLAGS += $(CAIRO_LIBS)
+ GTK_CAIRO_SRCS = gtk_glue_cairo.cpp gtk_glue_cairo.h
+ KDE_CAIRO_SRCS = #kde_glue_cairo.cpp kde_glue_cairo.h
else
-GTK_CAIRO_SRCS =
-KDE_CAIRO_SRCS =
+ GTK_CAIRO_SRCS =
+ KDE_CAIRO_SRCS =
endif
if USE_GUI_GTK
-GTK_SRCS = gtk.cpp gtksup.h gtk_glue.h $(GTK_CAIRO_SRCS) $(GTK_OPENGL_SRCS)
+ GTK_SRCS = gtk.cpp gtksup.h gtk_glue.h $(GTK_CAIRO_SRCS) $(GTK_OPENGL_SRCS)
+ AM_LDFLAGS += $(GTK2_LIBS)
+ INCLUDES += $(GTK2_CFLAGS)
else
-GTK_SRCS =
+ GTK_SRCS =
endif
if USE_GUI_SDL
-SDL_SRCS = sdl.cpp sdlsup.h # glow for SDL widgets
+ SDL_SRCS = sdl.cpp sdlsup.h # glow for SDL widgets
else
-SDL_SRCS =
+ SDL_SRCS =
endif
if USE_GUI_KDE
-KDE_SRCS = kde.cpp kdesup.h $(KDE_CAIRO_SRCS) $(KDE_OPENGL_SRCS)
+ KDE_SRCS = kde.cpp kdesup.h $(KDE_CAIRO_SRCS) $(KDE_OPENGL_SRCS)
+ INCLUDES += -I$(kde_includes)/kio $(all_includes)
else
-KDE_SRCS =
+ KDE_SRCS =
endif
#if USE_GUI_FLTK
-#FLTK_SRCS = fltk.cpp fltksup.h
+# FLTK_SRCS = fltk.cpp fltksup.h
+# INCLUDES += $(FLTK_INCLS)
#else
-#FLTK_SRCS =
+# FLTK_SRCS =
#endif
-INCLUDES = -I.. \
- -I$(kde_includes)/kio $(all_includes) \
- -I$(top_srcdir) \
- -I$(top_srcdir)/server \
- -I$(top_srcdir)/server/parser \
- -I$(top_srcdir)/libbase \
- -I$(top_srcdir)/backend \
- -I$(top_srcdir)/libgeometry \
- $(PTHREAD_CFLAGS) \
- $(SDL_CFLAGS) \
- $(SDL_MIXER_CFLAGS) \
- $(LIBXML_CFLAGS) \
- $(OPENGL_CFLAGS) \
- $(GLEXT_CFLAGS) \
- $(GTK2_CFLAGS) \
- $(PANGO_CFLAGS) \
- $(GLIB_CFLAGS) \
- $(GTK2_INCLS) \
- $(FLTK_INCLS) \
- $(KDE_INCLS) \
- $(CAIRO_CFLAGS) \
- $(ATK_CFLAGS) \
- $(DMALLOC_CFLAGS) \
- $(PNG_CFLAGS) \
- $(JPEG_CFLAGS) \
- $(MP3_CFLAGS) \
- $(OGG_CFLAGS) \
- $(BOOST_CFLAGS)
AM_CPPFLAGS = $(INCLUDES) -DPKGDATADIR=\"$(pkgdatadir)\"
@@ -117,15 +127,6 @@
dist_images_DATA = images/gnash_128_96.ico
imagesdir = $(pkgdatadir)
-## WARNING: make sure GLIB_LIBS appears first
-## See: http://lists.gnu.org/archive/html/gnash-dev/2006-07/msg00076.html
-AM_LDFLAGS = \
- $(GLIB_LIBS) \
- $(PANGO_LIBS) \
- $(GLEXT_LIBS) \
- $(BOOST_LIBS) \
- $(PTHREAD_LIBS)
-
lib_LTLIBRARIES = libgnashgui.la libgnashplayer.la
libgnashgui_la_SOURCES = \
$(SDL_SRCS) \
@@ -173,7 +174,9 @@
libgnashplayer.la
klash_SOURCES = gnash.cpp
-klash_CPPFLAGS = -DUSE_KDE
+klash_CPPFLAGS = \
+ $(KDE_INCLS) \
+ -DUSE_KDE
klash_LDFLAGS = -module -avoid-version -no-undefined
klash_LDADD = \
$(LIB_KDECORE) \