[Gnash-commit] /srv/bzr/gnash/trunk r11528: rearrange to work around obscure problem.

[Rob Savoye]

------------------------------------------------------------
revno: 11528
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Tue 2009-09-29 17:16:47 -0600
message:
  rearrange to work around obscure problem.
modified:
  libbase/Makefile.am

=== modified file 'libbase/Makefile.am'
--- a/libbase/Makefile.am       2009-09-24 16:32:22 +0000
+++ b/libbase/Makefile.am       2009-09-29 23:16:47 +0000
@@ -20,41 +20,6 @@
 # this is where Gnash plugins get installed
 pluginsdir = $(prefix)/lib/gnash/plugins
 
-if INSTALL_LTDL
-if !LIBLTDL2
-include_HEADERS =  $(top_srcdir)/libltdl/ltdl.h
-LIBLTDLLIB = libltdl.la
-LIBLTDLHEAD =  $(top_srcdir)/libltdl/ltdl.h
-endif
-endif
-
-if !LIBLTDL2
-libltdlc_la_CPPFLAGS = $(LTDLINCL) -I$(top_srcdir)/libltdl
-if CONVENIENCE_LTDL
-noinst_LTLIBRARIES = libltdlc.la
-libltdlc_la_SOURCES = $(top_srcdir)/libltdl/ltdl.c
-endif
-
-libltdl_la_SOURCES = $(top_srcdir)/libltdl/ltdl.c
-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 we are using an installable libltdl, then it needs to be built
 # before libgnash, as libgnash depends on it for extensions.
 pkglib_LTLIBRARIES =  $(LIBLTDLLIB) libgnashbase.la
@@ -94,20 +59,6 @@
        $(LIBADD_DL) \
        $(NULL)
 
-if WIN32
-  libgnashbase_la_LIBADD += -lws2_32 -lwinmm
-endif
-
-# Maybe use jemalloc, which handles memory fragmentation for
-# ECAMscript languages better than the regular system malloc.
-# This is controlled by the --enable-jemalloc (disabled by default)
-# configure option.
-if JEMALLOC
-MALLOC = jemalloc.c
-else
-MALLOC = 
-endif
-
 libgnashbase_la_SOURCES = \
        extension.cpp \
        $(MALLOC) \
@@ -136,6 +87,56 @@
        arg_parser.cpp \
        $(NULL)
 
+if INSTALL_LTDL
+if !LIBLTDL2
+include_HEADERS =  $(top_srcdir)/libltdl/ltdl.h
+LIBLTDLLIB = libltdl.la
+LIBLTDLHEAD =  $(top_srcdir)/libltdl/ltdl.h
+endif
+endif
+
+if !LIBLTDL2
+libltdlc_la_CPPFLAGS = $(LTDLINCL) -I$(top_srcdir)/libltdl
+if CONVENIENCE_LTDL
+noinst_LTLIBRARIES = libltdlc.la
+libltdlc_la_SOURCES = $(top_srcdir)/libltdl/ltdl.c
+endif
+
+libltdl_la_SOURCES = $(top_srcdir)/libltdl/ltdl.c
+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
+
+# Maybe use jemalloc, which handles memory fragmentation for
+# ECAMscript languages better than the regular system malloc.
+# This is controlled by the --enable-jemalloc (disabled by default)
+# configure option.
+if JEMALLOC
+MALLOC = jemalloc.c
+else
+MALLOC = 
+endif
+
 if USE_PNG
 libgnashbase_la_SOURCES += GnashImagePng.cpp
 endif