[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ./ChangeLog backend/Makefile.am
From: |
Rob Savoye |
Subject: |
[Gnash-commit] gnash ./ChangeLog backend/Makefile.am |
Date: |
Fri, 03 Feb 2006 19:26:51 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch:
Changes by: Rob Savoye <address@hidden> 06/02/03 19:26:51
Modified files:
. : ChangeLog
backend : Makefile.am
Log message:
* backend/Makefile.am (AM_LDFLAGS): Add $(X_LIBS) so we can link
with libraries in /usr/X11R6/lib.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.74&tr2=1.75&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/backend/Makefile.am.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.74 gnash/ChangeLog:1.75
--- gnash/ChangeLog:1.74 Fri Feb 3 18:16:33 2006
+++ gnash/ChangeLog Fri Feb 3 19:26:51 2006
@@ -1,5 +1,8 @@
2006-02-03 Rob Savoye <address@hidden>
+ * backend/Makefile.am (AM_LDFLAGS): Add $(X_LIBS) so we can link
+ with libraries in /usr/X11R6/lib.
+
* Makefile.am (ACLOCAL_AMFLAGS): Add so autoreconf works.
* server/action.cpp: Add missing opcodes to opcode table so we can
Index: gnash/backend/Makefile.am
diff -u gnash/backend/Makefile.am:1.13 gnash/backend/Makefile.am:1.14
--- gnash/backend/Makefile.am:1.13 Wed Feb 1 23:58:32 2006
+++ gnash/backend/Makefile.am Fri Feb 3 19:26:51 2006
@@ -36,6 +36,7 @@
$(SDL_CFLAGS) \
$(SDL_MIXER_LIBS) \
$(OPENGL_LIBS) \
+ $(X_LIBS) \
$(DMALLOC_LIBS) \
$(MP3_LIBS)
@@ -55,21 +56,21 @@
bin_PROGRAMS = gnash
-# noinst_LTLIBRARIES = libgbackend.la
-lib_LTLIBRARIES = libgbackend.la
+#noinst_LTLIBRARIES = libgbackend.la
+lib_LTLIBRARIES = libgnashbackend.la
-libgbackend_la_SOURCES = \
+libgnashbackend_la_SOURCES = \
render_handler_ogl.cpp \
sound_handler_sdl.cpp
gnash_SOURCES = gnash.cpp
gnash_LDFLAGS = -module -avoid-version -no-undefined
gnash_LDADD = $(AM_LDFLAGS) \
- ./libgbackend.la \
- ../server/libserver.la \
- ../server/libasobjs.la \
- ../libgeometry/libgeometry.la \
- ../libbase/libbase.la
+ ../backend/libgnashbackend.la \
+ ../server/libgnashserver.la \
+ ../server/libgnashasobjs.la \
+ ../libgeometry/libgnashgeo.la \
+ ../libbase/libgnashbase.la
# gnash_DEPENDENCIES =
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ./ChangeLog backend/Makefile.am,
Rob Savoye <=