[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/trunk r11571: reorder targets some more. U
From: |
Rob Savoye |
Subject: |
[Gnash-commit] /srv/bzr/gnash/trunk r11571: reorder targets some more. Us enew LIBLTDL1 instead of !LIBLTDL2 |
Date: |
Fri, 16 Oct 2009 16:59:09 -0600 |
User-agent: |
Bazaar (1.16.1) |
------------------------------------------------------------
revno: 11571
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Fri 2009-10-16 16:59:09 -0600
message:
reorder targets some more. Us enew LIBLTDL1 instead of !LIBLTDL2
modified:
libbase/Makefile.am
=== modified file 'libbase/Makefile.am'
--- a/libbase/Makefile.am 2009-09-29 23:42:11 +0000
+++ b/libbase/Makefile.am 2009-10-16 22:59:09 +0000
@@ -17,6 +17,8 @@
EXTRA_DIST = gnashrc.in gnashpluginrc.in
+sysconf_DATA = gnashrc gnashpluginrc
+
# this is where Gnash plugins get installed
pluginsdir = $(prefix)/lib/gnash/plugins
@@ -87,6 +89,20 @@
arg_parser.cpp \
$(NULL)
+edit = sed \
+ -e 's|@address@hidden|$(DEFAULT_FLASH_PLATFORM_ID)|g' \
+ -e 's|@address@hidden|$(DEFAULT_FLASH_MAJOR_VERSION)|g' \
+ -e 's|@address@hidden|$(DEFAULT_FLASH_MINOR_VERSION)|g' \
+ -e 's|@address@hidden|$(DEFAULT_FLASH_REV_NUMBER)|g' \
+ -e 's|@address@hidden|$(DEFAULT_STREAMS_TIMEOUT)|g' \
+ -e 's|@address@hidden|$(DEFAULT_SOL_SAFEDIR)|g'
+
+gnashrc: gnashrc.in Makefile
+ $(edit) '$(srcdir)/address@hidden' >$@
+
+gnashpluginrc: gnashpluginrc.in
+ $(edit) '$(srcdir)/address@hidden' >$@
+
if USE_PNG
libgnashbase_la_SOURCES += GnashImagePng.cpp
endif
@@ -95,14 +111,14 @@
endif
if INSTALL_LTDL
-if !LIBLTDL2
+if LIBLTDL1
include_HEADERS = $(top_srcdir)/libltdl/ltdl.h
LIBLTDLLIB = libltdl.la
LIBLTDLHEAD = $(top_srcdir)/libltdl/ltdl.h
endif
endif
-if !LIBLTDL2
+if LIBLTDL1
libltdlc_la_CPPFLAGS = $(LTDLINCL) -I$(top_srcdir)/libltdl
if CONVENIENCE_LTDL
noinst_LTLIBRARIES = libltdlc.la
@@ -113,23 +129,6 @@
libltdl_la_LDFLAGS = -no-undefined -version-info 4:4:1
libltdl_la_LIBADD = $(LIBADD_DL)
-sysconf_DATA = gnashrc gnashpluginrc
-
-edit = sed \
- -e 's|@address@hidden|$(DEFAULT_FLASH_PLATFORM_ID)|g' \
- -e 's|@address@hidden|$(DEFAULT_FLASH_MAJOR_VERSION)|g' \
- -e 's|@address@hidden|$(DEFAULT_FLASH_MINOR_VERSION)|g' \
- -e 's|@address@hidden|$(DEFAULT_FLASH_REV_NUMBER)|g' \
- -e 's|@address@hidden|$(DEFAULT_STREAMS_TIMEOUT)|g' \
- -e 's|@address@hidden|$(DEFAULT_SOL_SAFEDIR)|g'
-
-gnashrc: gnashrc.in Makefile
- $(edit) '$(srcdir)/address@hidden' >$@
-
-gnashpluginrc: gnashpluginrc.in
- $(edit) '$(srcdir)/address@hidden' >$@
-
-
if WIN32
libgnashbase_la_LIBADD += -lws2_32 -lwinmm
endif
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/trunk r11571: reorder targets some more. Us enew LIBLTDL1 instead of !LIBLTDL2,
Rob Savoye <=