makefiles for stc lib and sample for Unix

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6694 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/configure b/contrib/configure
index 573c95d95dd507a7cf9ec2c091f674f164c22a5a..a2f43590a5761b34ed58dea8e259522ca4f1e91b 100755 (executable)
--- a/contrib/configure
+++ b/contrib/configure
@@ -814,8 +814,10 @@ trap 'rm -fr `echo "
             src/Makefile
             src/ogl/Makefile
             src/mmedia/Makefile
             src/Makefile
             src/ogl/Makefile
             src/mmedia/Makefile

+            src/stc/Makefile

             samples/Makefile
             samples/mmedia/Makefile
             samples/Makefile
             samples/mmedia/Makefile

+            samples/stc/Makefile

          " | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
          " | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF


@@ -897,8 +899,10 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
             src/Makefile
             src/ogl/Makefile
             src/mmedia/Makefile
             src/Makefile
             src/ogl/Makefile
             src/mmedia/Makefile

+            src/stc/Makefile

             samples/Makefile
             samples/mmedia/Makefile
             samples/Makefile
             samples/mmedia/Makefile

+            samples/stc/Makefile

          "}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
          "}
 EOF
 cat >> $CONFIG_STATUS <<\EOF

diff --git a/contrib/configure.in b/contrib/configure.in
index c31253d6707a52547d295285a111145ef5b967d0..df41fab726290acc99262bf5dc09b133e688c01c 100644 (file)
--- a/contrib/configure.in
+++ b/contrib/configure.in
@@ -39,6 +39,8 @@ AC_OUTPUT([
             src/Makefile
             src/ogl/Makefile
             src/mmedia/Makefile
             src/Makefile
             src/ogl/Makefile
             src/mmedia/Makefile

+            src/stc/Makefile

             samples/Makefile
             samples/mmedia/Makefile
             samples/Makefile
             samples/mmedia/Makefile

+            samples/stc/Makefile

          ])
          ])

diff --git a/contrib/samples/stc/Makefile.in b/contrib/samples/stc/Makefile.in
new file mode 100644 (file)
index 0000000..e4f7953
--- /dev/null
+++ b/contrib/samples/stc/Makefile.in
@@ -0,0 +1,20 @@
+###############################################################################
+# Purpose: Makefile.in for STC sample for Unix with autoconf
+# Created: 14.03.00
+# Author:  VZ
+# Version: $Id$
+###############################################################################
+
+top_srcdir = @top_srcdir@/..
+top_builddir = ../../..
+program_dir = contrib/samples/stc
+
+PROGRAM=stctest
+
+OBJECTS=$(PROGRAM).o
+
+APPEXTRALIBS=$(top_builddir)/contrib/src/stc/libstc.a
+
+DATAFILES=stctest.cpp
+
+include ../../../src/makeprog.env

diff --git a/contrib/src/stc/Makefile.in b/contrib/src/stc/Makefile.in
new file mode 100644 (file)
index 0000000..b7239e1
--- /dev/null
+++ b/contrib/src/stc/Makefile.in
@@ -0,0 +1,36 @@
+###############################################################################
+# Purpose: Makefile.in for STC contrib for Unix with autoconf
+# Created: 14.03.00
+# Author:  VZ
+# Version: $Id$
+###############################################################################
+
+top_srcdir = @top_srcdir@/..
+top_builddir = ../../..
+
+this_dir = $(top_srcdir)/contrib/src/stc
+scintilla_dir=$(this_dir)/scintilla
+VPATH=$(this_dir)@PATH_IFS@$(scintilla_dir)/src # ':' for autoconf
+
+LIBTARGET=libstc
+
+OBJECTS=PlatWX.o ScintillaWX.o stc.o \
+        Accessor.o             \
+        AutoComplete.o     \
+        CallTip.o              \
+        CellBuffer.o       \
+        ContractionState.o  \
+        Document.o             \
+        Editor.o                   \
+        Indicator.o            \
+        KeyMap.o                   \
+        KeyWords.o             \
+        LineMarker.o       \
+        PropSet.o              \
+        ScintillaBase.o            \
+        Style.o                        \
+        ViewStyle.o
+        
+APPEXTRADEFS=-D__WX__ -DSCI_LEXER -I$(scintilla_dir)/src -I$(scintilla_dir)/include -I$(top_srcdir)/contrib/include
+
+include $(top_builddir)/src/makelib.env

diff --git a/samples/stc/Makefile.in b/samples/stc/Makefile.in
new file mode 100644 (file)
index 0000000..e4f7953
--- /dev/null
+++ b/samples/stc/Makefile.in
@@ -0,0 +1,20 @@
+###############################################################################
+# Purpose: Makefile.in for STC sample for Unix with autoconf
+# Created: 14.03.00
+# Author:  VZ
+# Version: $Id$
+###############################################################################
+
+top_srcdir = @top_srcdir@/..
+top_builddir = ../../..
+program_dir = contrib/samples/stc
+
+PROGRAM=stctest
+
+OBJECTS=$(PROGRAM).o
+
+APPEXTRALIBS=$(top_builddir)/contrib/src/stc/libstc.a
+
+DATAFILES=stctest.cpp
+
+include ../../../src/makeprog.env

diff --git a/src/stc/Makefile.in b/src/stc/Makefile.in
new file mode 100644 (file)
index 0000000..b7239e1
--- /dev/null
+++ b/src/stc/Makefile.in
@@ -0,0 +1,36 @@
+###############################################################################
+# Purpose: Makefile.in for STC contrib for Unix with autoconf
+# Created: 14.03.00
+# Author:  VZ
+# Version: $Id$
+###############################################################################
+
+top_srcdir = @top_srcdir@/..
+top_builddir = ../../..
+
+this_dir = $(top_srcdir)/contrib/src/stc
+scintilla_dir=$(this_dir)/scintilla
+VPATH=$(this_dir)@PATH_IFS@$(scintilla_dir)/src # ':' for autoconf
+
+LIBTARGET=libstc
+
+OBJECTS=PlatWX.o ScintillaWX.o stc.o \
+        Accessor.o             \
+        AutoComplete.o     \
+        CallTip.o              \
+        CellBuffer.o       \
+        ContractionState.o  \
+        Document.o             \
+        Editor.o                   \
+        Indicator.o            \
+        KeyMap.o                   \
+        KeyWords.o             \
+        LineMarker.o       \
+        PropSet.o              \
+        ScintillaBase.o            \
+        Style.o                        \
+        ViewStyle.o
+        
+APPEXTRADEFS=-D__WX__ -DSCI_LEXER -I$(scintilla_dir)/src -I$(scintilla_dir)/include -I$(top_srcdir)/contrib/include
+
+include $(top_builddir)/src/makelib.env