[Gnash-commit] gnash/plugin/mozilla-sdk Makefile.am

[Dossy Shiobara]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Dossy Shiobara <dossy>  08/03/30 18:25:34

Modified files:
        plugin/mozilla-sdk: Makefile.am 

Log message:
        Build libmozsdk separately, as its used by both the Win32 npgnash.dll
        and the libgnashplugin.so on *nix.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/mozilla-sdk/Makefile.am?cvsroot=gnash&r1=1.18&r2=1.19

Patches:
Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/mozilla-sdk/Makefile.am,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- Makefile.am 18 Mar 2008 01:28:52 -0000      1.18
+++ Makefile.am 30 Mar 2008 18:25:34 -0000      1.19
@@ -16,12 +16,20 @@
 #   along with this program; if not, write to the Free Software
 #   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-AUTOMAKE_OPTIONS = dejagnu
+AUTOMAKE_OPTIONS =
 
-AM_CPPFLAGS = -DPLUGIN_TRACE -DXP_UNIX \
-        -I.. \
+AM_CPPFLAGS = -DPLUGIN_TRACE
+
+if WIN32
+AM_CPPFLAGS += -DXP_WIN
+else
+AM_CPPFLAGS += -DXP_UNIX
+endif
+
+AM_CPPFLAGS += \
         -I$(srcdir) \
-       -I$(srcdir)/include
+       -I$(srcdir)/include \
+       -I$(top_srcdir)/libbase
 
 # AM_CXXFLAGS = $(CXXFLAGS) $(AM_CPPFLAGS)
 # AM_CPPFLAGS = -DPLUGIN_TRACE -DXP_UNIX # $(FIREFOX_DEFS)
@@ -30,7 +38,8 @@
 # noinst_LTLIBRARIES = libmozsdk.la
 pkglib_LTLIBRARIES = libmozsdk.la
 
-noinst_HEADERS = npplat.h \
+noinst_HEADERS = \
+       npplat.h \
         pluginbase.h \
          include/jri.h \
         include/npapi.h \
@@ -43,8 +52,8 @@
          include/jritypes.h \
          include/nptypes.h \
          include/prcpucfg.h \
-         prcpucfg-glibc.h \
-         prcpucfg-win32.h \
+       include/prcpucfg-glibc.h \
+       include/prcpucfg-win32.h \
          include/prlock.h \
          include/prcvar.h \
          include/prthread.h \