[BACK]Return to Makefile.am CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / pcre

Diff for /embedaddon/pcre/Makefile.am between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2012/02/21 23:05:51 version 1.1.1.2, 2012/02/21 23:50:25
Line 17  dist_doc_DATA = \ Line 17  dist_doc_DATA = \
 dist_html_DATA = \  dist_html_DATA = \
   doc/html/index.html \    doc/html/index.html \
   doc/html/pcre.html \    doc/html/pcre.html \
     doc/html/pcre16.html \
   doc/html/pcre-config.html \    doc/html/pcre-config.html \
   doc/html/pcre_assign_jit_stack.html \    doc/html/pcre_assign_jit_stack.html \
   doc/html/pcre_compile.html \    doc/html/pcre_compile.html \
Line 35  dist_html_DATA = \ Line 36  dist_html_DATA = \
   doc/html/pcre_get_stringtable_entries.html \    doc/html/pcre_get_stringtable_entries.html \
   doc/html/pcre_get_substring.html \    doc/html/pcre_get_substring.html \
   doc/html/pcre_get_substring_list.html \    doc/html/pcre_get_substring_list.html \
   doc/html/pcre_info.html \  
   doc/html/pcre_jit_stack_alloc.html \    doc/html/pcre_jit_stack_alloc.html \
   doc/html/pcre_jit_stack_free.html \    doc/html/pcre_jit_stack_free.html \
   doc/html/pcre_maketables.html \    doc/html/pcre_maketables.html \
     doc/html/pcre_pattern_to_host_byte_order.html \
   doc/html/pcre_refcount.html \    doc/html/pcre_refcount.html \
   doc/html/pcre_study.html \    doc/html/pcre_study.html \
     doc/html/pcre_utf16_to_host_byte_order.html \
   doc/html/pcre_version.html \    doc/html/pcre_version.html \
   doc/html/pcreapi.html \    doc/html/pcreapi.html \
   doc/html/pcrebuild.html \    doc/html/pcrebuild.html \
Line 79  check_SCRIPTS = Line 81  check_SCRIPTS =
 dist_noinst_SCRIPTS =  dist_noinst_SCRIPTS =
   
 # Some of the binaries we make are to be installed, and others are  # Some of the binaries we make are to be installed, and others are
# (non-user-visible) helper programs needed to build libpcre.# (non-user-visible) helper programs needed to build libpcre or libpcre16.
 bin_PROGRAMS =  bin_PROGRAMS =
 noinst_PROGRAMS =  noinst_PROGRAMS =
   
Line 169  pcre_chartables.c: $(srcdir)/pcre_chartables.c.dist Line 171  pcre_chartables.c: $(srcdir)/pcre_chartables.c.dist
   
 endif # WITH_REBUILD_CHARTABLES  endif # WITH_REBUILD_CHARTABLES
   
   BUILT_SOURCES = pcre_chartables.c
   
 ## The main pcre library  ## The main pcre library
   
   # Build the 8 bit library if it is enabled.
   if WITH_PCRE8
 lib_LTLIBRARIES += libpcre.la  lib_LTLIBRARIES += libpcre.la
 libpcre_la_SOURCES = \  libpcre_la_SOURCES = \
     pcre_byte_order.c \
   pcre_compile.c \    pcre_compile.c \
   pcre_config.c \    pcre_config.c \
   pcre_dfa_exec.c \    pcre_dfa_exec.c \
Line 180  libpcre_la_SOURCES = \ Line 187  libpcre_la_SOURCES = \
   pcre_fullinfo.c \    pcre_fullinfo.c \
   pcre_get.c \    pcre_get.c \
   pcre_globals.c \    pcre_globals.c \
   pcre_info.c \  
   pcre_internal.h \    pcre_internal.h \
   pcre_jit_compile.c \    pcre_jit_compile.c \
   pcre_maketables.c \    pcre_maketables.c \
   pcre_newline.c \    pcre_newline.c \
   pcre_ord2utf8.c \    pcre_ord2utf8.c \
   pcre_refcount.c \    pcre_refcount.c \
     pcre_string_utils.c \
   pcre_study.c \    pcre_study.c \
   pcre_tables.c \    pcre_tables.c \
   pcre_try_flipped.c \  
   pcre_ucd.c \    pcre_ucd.c \
   pcre_valid_utf8.c \    pcre_valid_utf8.c \
   pcre_version.c \    pcre_version.c \
Line 200  libpcre_la_SOURCES = \ Line 206  libpcre_la_SOURCES = \
 nodist_libpcre_la_SOURCES = \  nodist_libpcre_la_SOURCES = \
   pcre_chartables.c    pcre_chartables.c
   
# The pcre_printint.src file is #included by some source files, so it must beendif # WITH_PCRE8
# distributed. The pcre_chartables.c.dist file is the default version of 
# pcre_chartables.c, used unless --enable-rebuild-chartables is specified. 
EXTRA_DIST += pcre_printint.src pcre_chartables.c.dist 
   
   # Build the 16 bit library if it is enabled.
   if WITH_PCRE16
   lib_LTLIBRARIES += libpcre16.la
   libpcre16_la_SOURCES = \
     pcre16_byte_order.c \
     pcre16_chartables.c \
     pcre16_compile.c \
     pcre16_config.c \
     pcre16_dfa_exec.c \
     pcre16_exec.c \
     pcre16_fullinfo.c \
     pcre16_get.c \
     pcre16_globals.c \
     pcre16_jit_compile.c \
     pcre16_maketables.c \
     pcre16_newline.c \
     pcre16_ord2utf16.c \
     pcre16_refcount.c \
     pcre16_string_utils.c \
     pcre16_study.c \
     pcre16_tables.c \
     pcre16_ucd.c \
     pcre16_utf16_utils.c \
     pcre16_valid_utf16.c \
     pcre16_version.c \
     pcre16_xclass.c
   
   ## This file is generated as part of the building process, so don't distribute.
   nodist_libpcre16_la_SOURCES = \
     pcre_chartables.c
   
   endif # WITH_PCRE16
   
   # The pcre_chartables.c.dist file is the default version of pcre_chartables.c,
   # used unless --enable-rebuild-chartables is specified.
   EXTRA_DIST += pcre_chartables.c.dist
   
 # The JIT compiler lives in a separate directory, but its files are #included  # The JIT compiler lives in a separate directory, but its files are #included
 # when pcre_jit_compile.c is processed, so they must be distributed.  # when pcre_jit_compile.c is processed, so they must be distributed.
 EXTRA_DIST += \  EXTRA_DIST += \
Line 225  EXTRA_DIST += \ Line 265  EXTRA_DIST += \
   sljit/sljitNativeX86_common.c \    sljit/sljitNativeX86_common.c \
   sljit/sljitUtils.c    sljit/sljitUtils.c
   
   if WITH_PCRE8
 libpcre_la_LDFLAGS = $(EXTRA_LIBPCRE_LDFLAGS)  libpcre_la_LDFLAGS = $(EXTRA_LIBPCRE_LDFLAGS)
   endif # WITH_PCRE8
   if WITH_PCRE16
   libpcre16_la_LDFLAGS = $(EXTRA_LIBPCRE16_LDFLAGS)
   endif # WITH_PCRE16
   
 CLEANFILES += pcre_chartables.c  CLEANFILES += pcre_chartables.c
   
Line 234  if WITH_JIT Line 279  if WITH_JIT
 TESTS += pcre_jit_test  TESTS += pcre_jit_test
 noinst_PROGRAMS += pcre_jit_test  noinst_PROGRAMS += pcre_jit_test
 pcre_jit_test_SOURCES = pcre_jit_test.c  pcre_jit_test_SOURCES = pcre_jit_test.c
pcre_jit_test_LDADD = libpcre.lapcre_jit_test_LDADD =
 if WITH_PCRE8
 pcre_jit_test_LDADD += libpcre.la
 endif # WITH_PCRE8
 if WITH_PCRE16
 pcre_jit_test_LDADD += libpcre16.la
 endif # WITH_PCRE16
 endif # WITH_JIT  endif # WITH_JIT
   
 ## A version of the main pcre library that has a posix re API.  ## A version of the main pcre library that has a posix re API.
   if WITH_PCRE8
 lib_LTLIBRARIES += libpcreposix.la  lib_LTLIBRARIES += libpcreposix.la
 libpcreposix_la_SOURCES = \  libpcreposix_la_SOURCES = \
   pcreposix.c    pcreposix.c
 libpcreposix_la_LDFLAGS = $(EXTRA_LIBPCREPOSIX_LDFLAGS)  libpcreposix_la_LDFLAGS = $(EXTRA_LIBPCREPOSIX_LDFLAGS)
 libpcreposix_la_LIBADD = libpcre.la  libpcreposix_la_LIBADD = libpcre.la
   endif # WITH_PCRE8
   
 ## There's a C++ library as well.  ## There's a C++ library as well.
 if WITH_PCRE_CPP  if WITH_PCRE_CPP
Line 283  dist_noinst_SCRIPTS += RunTest Line 336  dist_noinst_SCRIPTS += RunTest
 EXTRA_DIST += RunTest.bat  EXTRA_DIST += RunTest.bat
 bin_PROGRAMS += pcretest  bin_PROGRAMS += pcretest
 pcretest_SOURCES = pcretest.c  pcretest_SOURCES = pcretest.c
pcretest_LDADD = libpcreposix.la $(LIBREADLINE)pcretest_LDADD = $(LIBREADLINE)
 if WITH_PCRE8
 pcretest_SOURCES += pcre_printint.c
 pcretest_LDADD += libpcreposix.la
 endif # WITH_PCRE8
 if WITH_PCRE16
 pcretest_SOURCES += pcre16_printint.c
 pcretest_LDADD += libpcre16.la
 endif # WITH_PCRE16
   
   if WITH_PCRE8
 TESTS += RunGrepTest  TESTS += RunGrepTest
 dist_noinst_SCRIPTS += RunGrepTest  dist_noinst_SCRIPTS += RunGrepTest
 bin_PROGRAMS += pcregrep  bin_PROGRAMS += pcregrep
 pcregrep_SOURCES = pcregrep.c  pcregrep_SOURCES = pcregrep.c
pcregrep_LDADD = libpcreposix.la $(LIBZ) $(LIBBZ2)pcregrep_LDADD = $(LIBZ) $(LIBBZ2)
 pcregrep_LDADD += libpcreposix.la
 endif # WITH_PCRE8
   
 EXTRA_DIST += \  EXTRA_DIST += \
   testdata/grepinput \    testdata/grepinput \
Line 301  EXTRA_DIST += \ Line 365  EXTRA_DIST += \
   testdata/grepoutput \    testdata/grepoutput \
   testdata/grepoutput8 \    testdata/grepoutput8 \
   testdata/grepoutputN \    testdata/grepoutputN \
     testdata/greppatN4 \
     testdata/saved16 \
     testdata/saved16BE-1 \
     testdata/saved16BE-2 \
     testdata/saved16LE-1 \
     testdata/saved16LE-2 \
     testdata/saved8 \
   testdata/testinput1 \    testdata/testinput1 \
   testdata/testinput2 \    testdata/testinput2 \
   testdata/testinput3 \    testdata/testinput3 \
Line 316  EXTRA_DIST += \ Line 387  EXTRA_DIST += \
   testdata/testinput13 \    testdata/testinput13 \
   testdata/testinput14 \    testdata/testinput14 \
   testdata/testinput15 \    testdata/testinput15 \
     testdata/testinput16 \
     testdata/testinput17 \
     testdata/testinput18 \
     testdata/testinput19 \
     testdata/testinput20 \
     testdata/testinput21 \
     testdata/testinput22 \
   testdata/testoutput1 \    testdata/testoutput1 \
   testdata/testoutput2 \    testdata/testoutput2 \
   testdata/testoutput3 \    testdata/testoutput3 \
Line 326  EXTRA_DIST += \ Line 404  EXTRA_DIST += \
   testdata/testoutput8 \    testdata/testoutput8 \
   testdata/testoutput9 \    testdata/testoutput9 \
   testdata/testoutput10 \    testdata/testoutput10 \
  testdata/testoutput11 \  testdata/testoutput11-16 \
   testdata/testoutput11-8 \
   testdata/testoutput12 \    testdata/testoutput12 \
   testdata/testoutput13 \    testdata/testoutput13 \
   testdata/testoutput14 \    testdata/testoutput14 \
   testdata/testoutput15 \    testdata/testoutput15 \
     testdata/testoutput16 \
     testdata/testoutput17 \
     testdata/testoutput18 \
     testdata/testoutput19 \
     testdata/testoutput20 \
     testdata/testoutput21 \
     testdata/testoutput22 \
   testdata/wintestinput3 \    testdata/wintestinput3 \
   testdata/wintestoutput3 \    testdata/wintestoutput3 \
   perltest.pl    perltest.pl
Line 360  test: check ; Line 446  test: check ;
 # A PCRE user submitted the following addition, saying that it "will allow  # A PCRE user submitted the following addition, saying that it "will allow
 # anyone using the 'mingw32' compiler to simply type 'make pcre.dll' and get a  # anyone using the 'mingw32' compiler to simply type 'make pcre.dll' and get a
 # nice DLL for Windows use". (It is used by the pcre.dll target.)  # nice DLL for Windows use". (It is used by the pcre.dll target.)
DLL_OBJS= pcre_compile.o pcre_config.o \DLL_OBJS= pcre_byte_order.o pcre_compile.o pcre_config.o \
         pcre_dfa_exec.o pcre_exec.o pcre_fullinfo.o pcre_get.o \          pcre_dfa_exec.o pcre_exec.o pcre_fullinfo.o pcre_get.o \
        pcre_globals.o pcre_info.o pcre_jit_compile.o pcre_maketables.o \        pcre_globals.o pcre_jit_compile.o pcre_maketables.o \
         pcre_newline.o pcre_ord2utf8.o pcre_refcount.o \          pcre_newline.o pcre_ord2utf8.o pcre_refcount.o \
        pcre_study.o pcre_tables.o pcre_try_flipped.o \        pcre_study.o pcre_tables.o pcre_ucd.o \
        pcre_ucd.o pcre_valid_utf8.o pcre_version.o \        pcre_valid_utf8.o pcre_version.o pcre_chartables.o \
        pcre_chartables.o \ 
         pcre_xclass.o          pcre_xclass.o
   
 # A PCRE user submitted the following addition, saying that it "will allow  # A PCRE user submitted the following addition, saying that it "will allow
Line 379  pcre.dll: $(DLL_OBJS) Line 464  pcre.dll: $(DLL_OBJS)
 # We have .pc files for pkg-config users.  # We have .pc files for pkg-config users.
 pkgconfigdir = $(libdir)/pkgconfig  pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libpcre.pc libpcreposix.pc  pkgconfig_DATA = libpcre.pc libpcreposix.pc
   if WITH_PCRE16
   pkgconfig_DATA += libpcre16.pc
   endif
 if WITH_PCRE_CPP  if WITH_PCRE_CPP
 pkgconfig_DATA += libpcrecpp.pc  pkgconfig_DATA += libpcrecpp.pc
 endif  endif
   
 dist_man_MANS = \  dist_man_MANS = \
   doc/pcre.3 \    doc/pcre.3 \
     doc/pcre16.3 \
   doc/pcre-config.1 \    doc/pcre-config.1 \
   doc/pcre_assign_jit_stack.3 \    doc/pcre_assign_jit_stack.3 \
   doc/pcre_compile.3 \    doc/pcre_compile.3 \
Line 403  dist_man_MANS = \ Line 492  dist_man_MANS = \
   doc/pcre_get_stringtable_entries.3 \    doc/pcre_get_stringtable_entries.3 \
   doc/pcre_get_substring.3 \    doc/pcre_get_substring.3 \
   doc/pcre_get_substring_list.3 \    doc/pcre_get_substring_list.3 \
   doc/pcre_info.3 \  
   doc/pcre_jit_stack_alloc.3 \    doc/pcre_jit_stack_alloc.3 \
   doc/pcre_jit_stack_free.3 \    doc/pcre_jit_stack_free.3 \
   doc/pcre_maketables.3 \    doc/pcre_maketables.3 \
     doc/pcre_pattern_to_host_byte_order.3 \
   doc/pcre_refcount.3 \    doc/pcre_refcount.3 \
   doc/pcre_study.3 \    doc/pcre_study.3 \
     doc/pcre_utf16_to_host_byte_order.3 \
   doc/pcre_version.3 \    doc/pcre_version.3 \
   doc/pcreapi.3 \    doc/pcreapi.3 \
   doc/pcrebuild.3 \    doc/pcrebuild.3 \
Line 428  dist_man_MANS = \ Line 518  dist_man_MANS = \
   doc/pcresyntax.3 \    doc/pcresyntax.3 \
   doc/pcretest.1 \    doc/pcretest.1 \
   doc/pcreunicode.3    doc/pcreunicode.3
   
   # Arrange for the per-function man pages to have 16-bit names as well.
   install-data-hook:
           ln -s pcre_assign_jit_stack.3           $(DESTDIR)$(man3dir)/pcre16_assign_jit_stack.3
           ln -s pcre_compile.3                    $(DESTDIR)$(man3dir)/pcre16_compile.3
           ln -s pcre_compile2.3                   $(DESTDIR)$(man3dir)/pcre16_compile2.3
           ln -s pcre_config.3                     $(DESTDIR)$(man3dir)/pcre16_config.3
           ln -s pcre_copy_named_substring.3       $(DESTDIR)$(man3dir)/pcre16_copy_named_substring.3
           ln -s pcre_copy_substring.3             $(DESTDIR)$(man3dir)/pcre16_copy_substring.3
           ln -s pcre_dfa_exec.3                   $(DESTDIR)$(man3dir)/pcre16_dfa_exec.3
           ln -s pcre_exec.3                       $(DESTDIR)$(man3dir)/pcre16_exec.3
           ln -s pcre_free_study.3                 $(DESTDIR)$(man3dir)/pcre16_free_study.3
           ln -s pcre_free_substring.3             $(DESTDIR)$(man3dir)/pcre16_free_substring.3
           ln -s pcre_free_substring_list.3        $(DESTDIR)$(man3dir)/pcre16_free_substring_list.3
           ln -s pcre_fullinfo.3                   $(DESTDIR)$(man3dir)/pcre16_fullinfo.3
           ln -s pcre_get_named_substring.3        $(DESTDIR)$(man3dir)/pcre16_get_named_substring.3
           ln -s pcre_get_stringnumber.3           $(DESTDIR)$(man3dir)/pcre16_get_stringnumber.3
           ln -s pcre_get_stringtable_entries.3    $(DESTDIR)$(man3dir)/pcre16_get_stringtable_entries.3
           ln -s pcre_get_substring.3              $(DESTDIR)$(man3dir)/pcre16_get_substring.3
           ln -s pcre_get_substring_list.3         $(DESTDIR)$(man3dir)/pcre16_get_substring_list.3
           ln -s pcre_jit_stack_alloc.3            $(DESTDIR)$(man3dir)/pcre16_jit_stack_alloc.3
           ln -s pcre_jit_stack_free.3             $(DESTDIR)$(man3dir)/pcre16_jit_stack_free.3
           ln -s pcre_maketables.3                 $(DESTDIR)$(man3dir)/pcre16_maketables.3
           ln -s pcre_pattern_to_host_byte_order.3 $(DESTDIR)$(man3dir)/pcre16_pattern_to_host_byte_order.3
           ln -s pcre_refcount.3                   $(DESTDIR)$(man3dir)/pcre16_refcount.3
           ln -s pcre_study.3                      $(DESTDIR)$(man3dir)/pcre16_study.3
           ln -s pcre_utf16_to_host_byte_order.3   $(DESTDIR)$(man3dir)/pcre16_utf16_to_host_byte_order.3
           ln -s pcre_version.3                    $(DESTDIR)$(man3dir)/pcre16_version.3
   
 pcrecpp_man = doc/pcrecpp.3  pcrecpp_man = doc/pcrecpp.3
 EXTRA_DIST += $(pcrecpp_man)  EXTRA_DIST += $(pcrecpp_man)
Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>