[Gnash-commit] /srv/bzr/gnash/trunk r12354: always install all the headers

[Rob Savoye]

------------------------------------------------------------
revno: 12354
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Thu 2010-08-05 11:09:35 -0600
message:
  always install all the headers
modified:
  configure.ac
  libbase/Makefile.am
  libcore/Makefile.am
  libcore/asobj/Makefile.am
  libcore/parser/Makefile.am
  libcore/vm/Makefile.am

=== modified file 'configure.ac'
--- a/configure.ac      2010-08-05 16:07:05 +0000
+++ b/configure.ac      2010-08-05 17:09:35 +0000
@@ -1631,20 +1631,6 @@
 fi
 
 dnl --------------------------------------------------------
-dnl  SDK
-dnl --------------------------------------------------------
-dnl Install the headers to make Gnash an SDK
-AC_ARG_ENABLE(sdkinstall,
-  AC_HELP_STRING([--enable-sdkinstall], [Enable installing the libraries and 
headers as an SDK]),
-[case "${enableval}" in
-  yes) sdkinstall=yes ;;
-  no)  sdkinstall=no ;;
-  *)   AC_MSG_ERROR([bad value ${enableval} for --enable-sdkinstall option]) ;;
-esac], sdkinstall=no)
-
-AM_CONDITIONAL(SDKINSTALL, test x$sdkinstall = xyes)
-
-dnl --------------------------------------------------------
 dnl  Double buffer
 dnl --------------------------------------------------------
 dnl Add an option for double buffering when rendering, currently only used by

=== modified file 'libbase/Makefile.am'
--- a/libbase/Makefile.am       2010-08-03 16:40:04 +0000
+++ b/libbase/Makefile.am       2010-08-05 17:09:35 +0000
@@ -217,12 +217,8 @@
        GnashImage.h \
        $(NULL)
 
-if SDKINSTALL
-noinst_HEADERS += $(EXTENSIONS_API)
-else
 instdir = $(includedir)/gnash
 inst_HEADERS = $(EXTENSIONS_API)
-endif
 
 libgnashbase_la_LDFLAGS = -release $(VERSION) 
 libgnashbase_la_DEPENDENCIES = $(LIBLTDLLIB)

=== modified file 'libcore/Makefile.am'
--- a/libcore/Makefile.am       2010-08-02 10:53:10 +0000
+++ b/libcore/Makefile.am       2010-08-05 17:09:35 +0000
@@ -290,12 +290,8 @@
 include $(srcdir)/asobj/flash.am
 libgnashcore_la_SOURCES += $(libgnashasobjs_la_SOURCES)
 
-if SDKINSTALL
-noinst_HEADERS += $(EXTENSIONS_API)
-else
 instdir = $(includedir)/gnash
 inst_HEADERS = $(EXTENSIONS_API)
-endif
 
 libgnashcore_la_LIBADD = \
        $(top_builddir)/libbase/libgnashbase.la \

=== modified file 'libcore/asobj/Makefile.am'
--- a/libcore/asobj/Makefile.am 2010-03-24 23:11:52 +0000
+++ b/libcore/asobj/Makefile.am 2010-08-05 17:09:35 +0000
@@ -111,12 +111,8 @@
 
 CLEANFILES = *classes.h
 
-if SDKINSTALL
-noinst_HEADERS += $(EXTENSIONS_API)
-else
 instdir = $(includedir)/gnash
 inst_HEADERS = $(EXTENSIONS_API)
-endif
 
 libgnashasobjs_la_LIBADD = \
        $(top_builddir)/libmedia/libgnashmedia.la \

=== modified file 'libcore/parser/Makefile.am'
--- a/libcore/parser/Makefile.am        2010-03-24 23:11:52 +0000
+++ b/libcore/parser/Makefile.am        2010-08-05 17:09:35 +0000
@@ -65,12 +65,8 @@
        movie_definition.h \
        $(NULL)
 
-if SDKINSTALL
-noinst_HEADERS += $(EXTENSIONS_API)
-else
 instdir = $(includedir)/gnash
 inst_HEADERS = $(EXTENSIONS_API)
-endif
 
 libgnashparser_la_LIBADD = \
        $(top_builddir)/libbase/libgnashbase.la

=== modified file 'libcore/vm/Makefile.am'
--- a/libcore/vm/Makefile.am    2010-07-29 02:33:36 +0000
+++ b/libcore/vm/Makefile.am    2010-08-05 17:09:35 +0000
@@ -71,12 +71,8 @@
        $(NULL)
 endif
 
-if SDKINSTALL
-noinst_HEADERS += $(EXTENSIONS_API)
-else
 instdir = $(includedir)/gnash
 inst_HEADERS = $(EXTENSIONS_API)
-endif
 
 libgnashvm_la_LIBADD = \
        $(top_builddir)/libbase/libgnashbase.la