2 --- ../orig/pcre-6.3/Makefile.in 2005-08-18 06:08:28.000000000 -0700
3 +++ ./Makefile.in 2006-06-30 09:11:02.000000000 -0700
6 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) -I. -I$(top_srcdir) $(NEWLINE) $(LINK_SIZE) $(MATCH_LIMIT) $(NO_RECURSE) $(EBCDIC)
7 LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) -c $(CXXFLAGS) -I. -I$(top_srcdir) $(NEWLINE) $(LINK_SIZE) $(MATCH_LIMIT) $(NO_RECURSE) $(EBCDIC)
8 -@ON_WINDOWS@LINK = $(CC) $(LDFLAGS) -I. -I$(top_srcdir) -L.libs
9 -@NOT_ON_WINDOWS@LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -I. -I$(top_srcdir)
10 +LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -I. -I$(top_srcdir)
11 LINKLIB = $(LIBTOOL) --mode=link $(CC) -export-symbols-regex '^[^_]|__?pcre_.*utf8|__?pcre_printint' $(LDFLAGS) -I. -I$(top_srcdir)
12 LINK_FOR_BUILD = $(LIBTOOL) --mode=link $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -I. -I$(top_srcdir)
13 -@ON_WINDOWS@CXXLINK = $(CXX) $(LDFLAGS) -I. -I$(top_srcdir) -L.libs
14 -@NOT_ON_WINDOWS@CXXLINK = $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -I. -I$(top_srcdir)
15 +CXXLINK = $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -I. -I$(top_srcdir)
16 CXXLINKLIB = $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -I. -I$(top_srcdir)
18 # These are the version numbers for the shared libraries
21 # Some Windows-specific targets for MinGW. Do not use for Cygwin.
23 -winshared : .libs/@WIN_PREFIX@pcre.dll .libs/@WIN_PREFIX@pcreposix.dll \
24 - .libs/@WIN_PREFIX@pcrecpp.dll
25 +winshared : .libs/pcre.dll .libs/pcreposix.dll \
28 -.libs/@WIN_PREFIX@pcre.dll : libpcre.la
29 +.libs/pcre.dll : libpcre.la
30 $(CC) $(CFLAGS) -shared -o $@ \
31 -Wl,--whole-archive .libs/libpcre.a \
32 -Wl,--out-implib,.libs/libpcre.dll.a \
33 - -Wl,--output-def,.libs/@WIN_PREFIX@pcre.dll-def \
34 + -Wl,--output-def,.libs/pcre.dll-def \
35 -Wl,--export-all-symbols \
36 -Wl,--no-whole-archive
37 - sed -e "s#dlname=''#dlname='../bin/@WIN_PREFIX@pcre.dll'#" \
38 + sed -e "s#dlname=''#dlname='../bin/pcre.dll'#" \
39 -e "s#library_names=''#library_names='libpcre.dll.a'#" \
40 < .libs/libpcre.lai > .libs/libpcre.lai.tmp && \
41 mv -f .libs/libpcre.lai.tmp .libs/libpcre.lai
42 - sed -e "s#dlname=''#dlname='../bin/@WIN_PREFIX@pcre.dll'#" \
43 + sed -e "s#dlname=''#dlname='../bin/pcre.dll'#" \
44 -e "s#library_names=''#library_names='libpcre.dll.a'#" \
45 < libpcre.la > libpcre.la.tmp && \
46 mv -f libpcre.la.tmp libpcre.la
49 -.libs/@WIN_PREFIX@pcreposix.dll: libpcreposix.la libpcre.la
50 +.libs/pcreposix.dll: libpcreposix.la libpcre.la
51 $(CC) $(CFLAGS) -shared -o $@ \
52 -Wl,--whole-archive .libs/libpcreposix.a \
53 - -Wl,--out-implib,.libs/@WIN_PREFIX@pcreposix.dll.a \
54 - -Wl,--output-def,.libs/@WIN_PREFIX@libpcreposix.dll-def \
55 + -Wl,--out-implib,.libs/libpcreposix.dll.a \
56 + -Wl,--output-def,.libs/libpcreposix.dll-def \
57 -Wl,--export-all-symbols \
58 -Wl,--no-whole-archive .libs/libpcre.a
59 - sed -e "s#dlname=''#dlname='../bin/@WIN_PREFIX@pcreposix.dll'#" \
60 + sed -e "s#dlname=''#dlname='../bin/pcreposix.dll'#" \
61 -e "s#library_names=''#library_names='libpcreposix.dll.a'#"\
62 < .libs/libpcreposix.lai > .libs/libpcreposix.lai.tmp && \
63 mv -f .libs/libpcreposix.lai.tmp .libs/libpcreposix.lai
64 - sed -e "s#dlname=''#dlname='../bin/@WIN_PREFIX@pcreposix.dll'#" \
65 + sed -e "s#dlname=''#dlname='../bin/pcreposix.dll'#" \
66 -e "s#library_names=''#library_names='libpcreposix.dll.a'#"\
67 < libpcreposix.la > libpcreposix.la.tmp && \
68 mv -f libpcreposix.la.tmp libpcreposix.la
70 -.libs/@WIN_PREFIX@pcrecpp.dll: libpcrecpp.la libpcre.la
71 +.libs/pcrecpp.dll: libpcrecpp.la libpcre.la
72 $(CXX) $(CXXFLAGS) -shared -o $@ \
73 -Wl,--whole-archive .libs/libpcrecpp.a \
74 - -Wl,--out-implib,.libs/@WIN_PREFIX@pcrecpp.dll.a \
75 - -Wl,--output-def,.libs/@WIN_PREFIX@libpcrecpp.dll-def \
76 + -Wl,--out-implib,.libs/libpcrecpp.dll.a \
77 + -Wl,--output-def,.libs/libpcrecpp.dll-def \
78 -Wl,--export-all-symbols \
79 -Wl,--no-whole-archive .libs/libpcre.a
80 - sed -e "s#dlname=''#dlname='../bin/@WIN_PREFIX@pcrecpp.dll'#" \
81 + sed -e "s#dlname=''#dlname='../bin/pcrecpp.dll'#" \
82 -e "s#library_names=''#library_names='libpcrecpp.dll.a'#"\
83 < .libs/libpcrecpp.lai > .libs/libpcrecpp.lai.tmp && \
84 mv -f .libs/libpcrecpp.lai.tmp .libs/libpcrecpp.lai
85 - sed -e "s#dlname=''#dlname='../bin/@WIN_PREFIX@pcrecpp.dll'#" \
86 + sed -e "s#dlname=''#dlname='../bin/pcrecpp.dll'#" \
87 -e "s#library_names=''#library_names='libpcrecpp.dll.a'#"\
88 < libpcrecpp.la > libpcrecpp.la.tmp && \
89 mv -f libpcrecpp.la.tmp libpcrecpp.la
91 wininstall : winshared
92 $(mkinstalldirs) $(DESTDIR)$(LIBDIR)
93 $(mkinstalldirs) $(DESTDIR)$(BINDIR)
94 - $(INSTALL) .libs/@WIN_PREFIX@pcre.dll $(DESTDIR)$(BINDIR)/@WIN_PREFIX@pcre.dll
95 - $(INSTALL) .libs/@WIN_PREFIX@pcreposix.dll $(DESTDIR)$(BINDIR)/@WIN_PREFIX@pcreposix.dll
96 - $(INSTALL) .libs/@WIN_PREFIX@libpcreposix.dll.a $(DESTDIR)$(LIBDIR)/@WIN_PREFIX@libpcreposix.dll.a
97 - $(INSTALL) .libs/@WIN_PREFIX@libpcre.dll.a $(DESTDIR)$(LIBDIR)/@WIN_PREFIX@libpcre.dll.a
98 -@HAVE_CPP@ $(INSTALL) .libs/@WIN_PREFIX@pcrecpp.dll $(DESTDIR)$(BINDIR)/@WIN_PREFIX@pcrecpp.dll
99 -@HAVE_CPP@ $(INSTALL) .libs/@WIN_PREFIX@libpcrecpp.dll.a $(DESTDIR)$(LIBDIR)/@WIN_PREFIX@libpcrecpp.dll.a
100 - -strip -g $(DESTDIR)$(BINDIR)/@WIN_PREFIX@pcre.dll
101 - -strip -g $(DESTDIR)$(BINDIR)/@WIN_PREFIX@pcreposix.dll
102 -@HAVE_CPP@ -strip -g $(DESTDIR)$(BINDIR)/@WIN_PREFIX@pcrecpp.dll
103 + $(INSTALL) .libs/pcre.dll $(DESTDIR)$(BINDIR)/pcre.dll
104 + $(INSTALL) .libs/pcreposix.dll $(DESTDIR)$(BINDIR)/pcreposix.dll
105 + $(INSTALL) .libs/libpcreposix.dll.a $(DESTDIR)$(LIBDIR)/libpcreposix.dll.a
106 + $(INSTALL) .libs/libpcre.dll.a $(DESTDIR)$(LIBDIR)/libpcre.dll.a
107 +@HAVE_CPP@ $(INSTALL) .libs/pcrecpp.dll $(DESTDIR)$(BINDIR)/pcrecpp.dll
108 +@HAVE_CPP@ $(INSTALL) .libs/libpcrecpp.dll.a $(DESTDIR)$(LIBDIR)/libpcrecpp.dll.a
109 + -strip -g $(DESTDIR)$(BINDIR)/pcre.dll
110 + -strip -g $(DESTDIR)$(BINDIR)/pcreposix.dll
111 +@HAVE_CPP@ -strip -g $(DESTDIR)$(BINDIR)/pcrecpp.dll
112 -strip $(DESTDIR)$(BINDIR)/pcregrep@EXEEXT@
113 -strip $(DESTDIR)$(BINDIR)/pcretest@EXEEXT@
115 @@ -555,12 +553,12 @@
119 -@WIN_PREFIX@pcre.dll : winshared
120 - cp .libs/@WIN_PREFIX@pcre.dll .
121 +pcre.dll : winshared
122 + cp .libs/pcre.dll .
126 -runtest: all @ON_WINDOWS@ @WIN_PREFIX@pcre.dll
127 +runtest: all @ON_WINDOWS@ pcre.dll