← Back to branch summary

~verterok/ubuntu/lucid/protobuf/2.4.0a-backport

« back to all changes in this revision

Viewing changes to src/Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2011-05-31 14:41:47 UTC
  • mfrom: (2.2.8 sid)
  • Revision ID: james.westby@ubuntu.com-20110531144147-s41g5fozgvyo462l
Tags: 2.4.0a-2ubuntu1
* Merge with Debian; remaining changes:
  - Fix linking with -lpthread.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Makefile.in
90
90
LTLIBRARIES = $(lib_LTLIBRARIES)
91
91
am__DEPENDENCIES_1 =
92
92
libprotobuf_lite_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
93
 
am_libprotobuf_lite_la_OBJECTS = common.lo once.lo hash.lo \
94
 
        extension_set.lo generated_message_util.lo message_lite.lo \
95
 
        repeated_field.lo wire_format_lite.lo coded_stream.lo \
96
 
        zero_copy_stream.lo zero_copy_stream_impl_lite.lo
 
93
am_libprotobuf_lite_la_OBJECTS = common.lo once.lo extension_set.lo \
 
94
        generated_message_util.lo message_lite.lo repeated_field.lo \
 
95
        wire_format_lite.lo coded_stream.lo zero_copy_stream.lo \
 
96
        zero_copy_stream_impl_lite.lo
97
97
libprotobuf_lite_la_OBJECTS = $(am_libprotobuf_lite_la_OBJECTS)
98
98
libprotobuf_lite_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
99
99
        $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
100
100
        $(CXXFLAGS) $(libprotobuf_lite_la_LDFLAGS) $(LDFLAGS) -o $@
101
101
libprotobuf_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
102
 
am__objects_1 = common.lo once.lo hash.lo extension_set.lo \
 
102
am__objects_1 = common.lo once.lo extension_set.lo \
103
103
        generated_message_util.lo message_lite.lo repeated_field.lo \
104
104
        wire_format_lite.lo coded_stream.lo zero_copy_stream.lo \
105
105
        zero_copy_stream_impl_lite.lo
123
123
        cpp_string_field.lo java_enum.lo java_enum_field.lo \
124
124
        java_extension.lo java_field.lo java_file.lo java_generator.lo \
125
125
        java_helpers.lo java_message.lo java_message_field.lo \
126
 
        java_primitive_field.lo java_service.lo python_generator.lo
 
126
        java_primitive_field.lo java_service.lo java_string_field.lo \
 
127
        python_generator.lo
127
128
libprotoc_la_OBJECTS = $(am_libprotoc_la_OBJECTS)
128
129
libprotoc_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
129
130
        $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
341
342
CYGPATH_W = @CYGPATH_W@
342
343
DEFS = @DEFS@
343
344
DEPDIR = @DEPDIR@
 
345
DLLTOOL = @DLLTOOL@
344
346
DSYMUTIL = @DSYMUTIL@
345
347
DUMPBIN = @DUMPBIN@
346
348
ECHO_C = @ECHO_C@
365
367
LN_S = @LN_S@
366
368
LTLIBOBJS = @LTLIBOBJS@
367
369
MAKEINFO = @MAKEINFO@
 
370
MANIFEST_TOOL = @MANIFEST_TOOL@
368
371
MKDIR_P = @MKDIR_P@
369
372
NM = @NM@
370
373
NMEDIT = @NMEDIT@
396
399
abs_srcdir = @abs_srcdir@
397
400
abs_top_builddir = @abs_top_builddir@
398
401
abs_top_srcdir = @abs_top_srcdir@
 
402
ac_ct_AR = @ac_ct_AR@
399
403
ac_ct_CC = @ac_ct_CC@
400
404
ac_ct_CXX = @ac_ct_CXX@
401
405
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
430
434
libexecdir = @libexecdir@
431
435
localedir = @localedir@
432
436
localstatedir = @localstatedir@
433
 
lt_ECHO = @lt_ECHO@
434
437
mandir = @mandir@
435
438
mkdir_p = @mkdir_p@
436
439
oldincludedir = @oldincludedir@
515
518
 
516
519
lib_LTLIBRARIES = libprotobuf-lite.la libprotobuf.la libprotoc.la
517
520
libprotobuf_lite_la_LIBADD = $(PTHREAD_LIBS)
518
 
libprotobuf_lite_la_LDFLAGS = -version-info 6:0:0 -export-dynamic -no-undefined
 
521
libprotobuf_lite_la_LDFLAGS = -version-info 7:0:0 -export-dynamic -no-undefined
519
522
libprotobuf_lite_la_SOURCES = \
520
523
  google/protobuf/stubs/common.cc                              \
521
524
  google/protobuf/stubs/once.cc                                \
522
 
  google/protobuf/stubs/hash.cc                                \
523
525
  google/protobuf/stubs/hash.h                                 \
524
526
  google/protobuf/stubs/map-util.h                             \
525
527
  google/protobuf/stubs/stl_util-inl.h                         \
534
536
  google/protobuf/io/zero_copy_stream_impl_lite.cc
535
537
 
536
538
libprotobuf_la_LIBADD = $(PTHREAD_LIBS)
537
 
libprotobuf_la_LDFLAGS = -version-info 6:0:0 -export-dynamic -no-undefined
 
539
libprotobuf_la_LDFLAGS = -version-info 7:0:0 -export-dynamic -no-undefined
538
540
libprotobuf_la_SOURCES = \
539
541
  $(libprotobuf_lite_la_SOURCES)                               \
540
542
  google/protobuf/stubs/strutil.cc                             \
562
564
  google/protobuf/compiler/parser.cc
563
565
 
564
566
libprotoc_la_LIBADD = $(PTHREAD_LIBS) libprotobuf.la
565
 
libprotoc_la_LDFLAGS = -version-info 6:0:0 -export-dynamic -no-undefined
 
567
libprotoc_la_LDFLAGS = -version-info 7:0:0 -export-dynamic -no-undefined
566
568
libprotoc_la_SOURCES = \
567
569
  google/protobuf/compiler/code_generator.cc                   \
568
570
  google/protobuf/compiler/command_line_interface.cc           \
616
618
  google/protobuf/compiler/java/java_primitive_field.h         \
617
619
  google/protobuf/compiler/java/java_service.cc                \
618
620
  google/protobuf/compiler/java/java_service.h                 \
 
621
  google/protobuf/compiler/java/java_string_field.cc           \
 
622
  google/protobuf/compiler/java/java_string_field.h            \
619
623
  google/protobuf/compiler/python/python_generator.cc
620
624
 
621
625
protoc_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la
954
958
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/generated_message_reflection.Plo@am__quote@
955
959
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/generated_message_util.Plo@am__quote@
956
960
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gzip_stream.Plo@am__quote@
957
 
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hash.Plo@am__quote@
958
961
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer.Plo@am__quote@
959
962
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/java_enum.Plo@am__quote@
960
963
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/java_enum_field.Plo@am__quote@
967
970
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/java_message_field.Plo@am__quote@
968
971
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/java_primitive_field.Plo@am__quote@
969
972
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/java_service.Plo@am__quote@
 
973
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/java_string_field.Plo@am__quote@
970
974
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
971
975
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/message.Plo@am__quote@
972
976
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/message_lite.Plo@am__quote@
1096
1100
@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1097
1101
@am__fastdepCXX_FALSE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o once.lo `test -f 'google/protobuf/stubs/once.cc' || echo '$(srcdir)/'`google/protobuf/stubs/once.cc
1098
1102
 
1099
 
hash.lo: google/protobuf/stubs/hash.cc
1100
 
@am__fastdepCXX_TRUE@   $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT hash.lo -MD -MP -MF $(DEPDIR)/hash.Tpo -c -o hash.lo `test -f 'google/protobuf/stubs/hash.cc' || echo '$(srcdir)/'`google/protobuf/stubs/hash.cc
1101
 
@am__fastdepCXX_TRUE@   $(am__mv) $(DEPDIR)/hash.Tpo $(DEPDIR)/hash.Plo
1102
 
@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='google/protobuf/stubs/hash.cc' object='hash.lo' libtool=yes @AMDEPBACKSLASH@
1103
 
@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1104
 
@am__fastdepCXX_FALSE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o hash.lo `test -f 'google/protobuf/stubs/hash.cc' || echo '$(srcdir)/'`google/protobuf/stubs/hash.cc
1105
 
 
1106
1103
extension_set.lo: google/protobuf/extension_set.cc
1107
1104
@am__fastdepCXX_TRUE@   $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT extension_set.lo -MD -MP -MF $(DEPDIR)/extension_set.Tpo -c -o extension_set.lo `test -f 'google/protobuf/extension_set.cc' || echo '$(srcdir)/'`google/protobuf/extension_set.cc
1108
1105
@am__fastdepCXX_TRUE@   $(am__mv) $(DEPDIR)/extension_set.Tpo $(DEPDIR)/extension_set.Plo
1509
1506
@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1510
1507
@am__fastdepCXX_FALSE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o java_service.lo `test -f 'google/protobuf/compiler/java/java_service.cc' || echo '$(srcdir)/'`google/protobuf/compiler/java/java_service.cc
1511
1508
 
 
1509
java_string_field.lo: google/protobuf/compiler/java/java_string_field.cc
 
1510
@am__fastdepCXX_TRUE@   $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT java_string_field.lo -MD -MP -MF $(DEPDIR)/java_string_field.Tpo -c -o java_string_field.lo `test -f 'google/protobuf/compiler/java/java_string_field.cc' || echo '$(srcdir)/'`google/protobuf/compiler/java/java_string_field.cc
 
1511
@am__fastdepCXX_TRUE@   $(am__mv) $(DEPDIR)/java_string_field.Tpo $(DEPDIR)/java_string_field.Plo
 
1512
@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='google/protobuf/compiler/java/java_string_field.cc' object='java_string_field.lo' libtool=yes @AMDEPBACKSLASH@
 
1513
@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 
1514
@am__fastdepCXX_FALSE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o java_string_field.lo `test -f 'google/protobuf/compiler/java/java_string_field.cc' || echo '$(srcdir)/'`google/protobuf/compiler/java/java_string_field.cc
 
1515
 
1512
1516
python_generator.lo: google/protobuf/compiler/python/python_generator.cc
1513
1517
@am__fastdepCXX_TRUE@   $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT python_generator.lo -MD -MP -MF $(DEPDIR)/python_generator.Tpo -c -o python_generator.lo `test -f 'google/protobuf/compiler/python/python_generator.cc' || echo '$(srcdir)/'`google/protobuf/compiler/python/python_generator.cc
1514
1518
@am__fastdepCXX_TRUE@   $(am__mv) $(DEPDIR)/python_generator.Tpo $(DEPDIR)/python_generator.Plo