Skip to content

P
protobuf-c
Commit 9b667aed authored by Robert Edmonds's avatar Robert Edmonds
Browse files
Options

Makefile.am: protoc-c/ → protoc-gen-c/

parent 4b3f45b0
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 55 deletions
Makefile.am
View file @ 9b667aed
...@@ -74,41 +74,41 @@ EXTRA_DIST += protobuf-c/libprotobuf-c.pc.in ...@@ -74,41 +74,41 @@ EXTRA_DIST += protobuf-c/libprotobuf-c.pc.in
if BUILD_COMPILER if BUILD_COMPILER
bin_PROGRAMS += protoc-c/protoc-gen-c bin_PROGRAMS += protoc-gen-c/protoc-gen-c
protoc_c_protoc_gen_c_SOURCES = \ protoc_gen_c_protoc_gen_c_SOURCES = \
protoc-c/c_bytes_field.cc \ protoc-gen-c/c_bytes_field.cc \
protoc-c/c_bytes_field.h \ protoc-gen-c/c_bytes_field.h \
protoc-c/c_enum.cc \ protoc-gen-c/c_enum.cc \
protoc-c/c_enum.h \ protoc-gen-c/c_enum.h \
protoc-c/c_enum_field.cc \ protoc-gen-c/c_enum_field.cc \
protoc-c/c_enum_field.h \ protoc-gen-c/c_enum_field.h \
protoc-c/c_extension.cc \ protoc-gen-c/c_extension.cc \
protoc-c/c_extension.h \ protoc-gen-c/c_extension.h \
protoc-c/c_field.cc \ protoc-gen-c/c_field.cc \
protoc-c/c_field.h \ protoc-gen-c/c_field.h \
protoc-c/c_file.cc \ protoc-gen-c/c_file.cc \
protoc-c/c_file.h \ protoc-gen-c/c_file.h \
protoc-c/c_generator.cc \ protoc-gen-c/c_generator.cc \
protoc-c/c_generator.h \ protoc-gen-c/c_generator.h \
protoc-c/c_helpers.cc \ protoc-gen-c/c_helpers.cc \
protoc-c/c_helpers.h \ protoc-gen-c/c_helpers.h \
protoc-c/c_message.cc \ protoc-gen-c/c_message.cc \
protoc-c/c_message.h \ protoc-gen-c/c_message.h \
protoc-c/c_message_field.cc \ protoc-gen-c/c_message_field.cc \
protoc-c/c_message_field.h \ protoc-gen-c/c_message_field.h \
protoc-c/c_primitive_field.cc \ protoc-gen-c/c_primitive_field.cc \
protoc-c/c_primitive_field.h \ protoc-gen-c/c_primitive_field.h \
protoc-c/c_service.cc \ protoc-gen-c/c_service.cc \
protoc-c/c_service.h \ protoc-gen-c/c_service.h \
protoc-c/c_string_field.cc \ protoc-gen-c/c_string_field.cc \
protoc-c/c_string_field.h \ protoc-gen-c/c_string_field.h \
protobuf-c/protobuf-c.pb.cc \ protobuf-c/protobuf-c.pb.cc \
protobuf-c/protobuf-c.pb.h \ protobuf-c/protobuf-c.pb.h \
protoc-c/main.cc protoc-gen-c/main.cc
protoc_c_protoc_gen_c_CXXFLAGS = \ protoc_gen_c_protoc_gen_c_CXXFLAGS = \
$(AM_CXXFLAGS) \ $(AM_CXXFLAGS) \
$(protobuf_CFLAGS) $(protobuf_CFLAGS)
protoc_c_protoc_gen_c_LDADD = \ protoc_gen_c_protoc_gen_c_LDADD = \
-lprotoc \ -lprotoc \
$(protobuf_LIBS) $(protobuf_LIBS)
...@@ -187,20 +187,20 @@ t_generated_code2_cxx_generate_packed_data_CXXFLAGS = \ ...@@ -187,20 +187,20 @@ t_generated_code2_cxx_generate_packed_data_CXXFLAGS = \
t_generated_code2_cxx_generate_packed_data_LDADD = \ t_generated_code2_cxx_generate_packed_data_LDADD = \
$(protobuf_LIBS) $(protobuf_LIBS)
t/test.pb-c.c t/test.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test.proto t/test.pb-c.c t/test.pb-c.h: $(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test.proto
$(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test.proto $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test.proto
t/test-optimized.pb-c.c t/test-optimized.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test-optimized.proto t/test-optimized.pb-c.c t/test-optimized.pb-c.h: $(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test-optimized.proto
$(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-optimized.proto $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-optimized.proto
t/test-full.pb-c.c t/test-full.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test-full.proto t/test-full.pb-c.c t/test-full.pb-c.h: $(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test-full.proto
$(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-full.proto $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-full.proto
t/test-full.pb.cc t/test-full.pb.h: @PROTOC@ $(top_srcdir)/t/test-full.proto t/test-full.pb.cc t/test-full.pb.h: @PROTOC@ $(top_srcdir)/t/test-full.proto
$(AM_V_GEN)@PROTOC@ -I$(top_srcdir) --cpp_out=$(top_builddir) $(top_srcdir)/t/test-full.proto $(AM_V_GEN)@PROTOC@ -I$(top_srcdir) --cpp_out=$(top_builddir) $(top_srcdir)/t/test-full.proto
t/test-proto3.pb-c.c t/test-proto3.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test-proto3.proto t/test-proto3.pb-c.c t/test-proto3.pb-c.h: $(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test-proto3.proto
$(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-proto3.proto $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-proto3.proto
t/generated-code2/test-full-cxx-output.inc: t/generated-code2/cxx-generate-packed-data$(EXEEXT) t/generated-code2/test-full-cxx-output.inc: t/generated-code2/cxx-generate-packed-data$(EXEEXT)
$(AM_V_GEN)$(top_builddir)/t/generated-code2/cxx-generate-packed-data$(EXEEXT) > $(top_builddir)/t/generated-code2/test-full-cxx-output.inc $(AM_V_GEN)$(top_builddir)/t/generated-code2/cxx-generate-packed-data$(EXEEXT) > $(top_builddir)/t/generated-code2/test-full-cxx-output.inc
...@@ -228,8 +228,8 @@ t_issue204_issue204_SOURCES = \ ...@@ -228,8 +228,8 @@ t_issue204_issue204_SOURCES = \
t/issue204/issue204.pb-c.c t/issue204/issue204.pb-c.c
t_issue204_issue204_LDADD = \ t_issue204_issue204_LDADD = \
protobuf-c/libprotobuf-c.la protobuf-c/libprotobuf-c.la
t/issue204/issue204.pb-c.c t/issue204/issue204.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/issue204/issue204.proto t/issue204/issue204.pb-c.c t/issue204/issue204.pb-c.h: $(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/issue204/issue204.proto
$(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/issue204/issue204.proto $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/issue204/issue204.proto
BUILT_SOURCES += \ BUILT_SOURCES += \
t/issue204/issue204.pb-c.c t/issue204/issue204.pb-c.h t/issue204/issue204.pb-c.c t/issue204/issue204.pb-c.h
EXTRA_DIST += \ EXTRA_DIST += \
...@@ -245,8 +245,8 @@ t_issue220_issue220_SOURCES = \ ...@@ -245,8 +245,8 @@ t_issue220_issue220_SOURCES = \
t/issue220/issue220.pb-c.c t/issue220/issue220.pb-c.c
t_issue220_issue220_LDADD = \ t_issue220_issue220_LDADD = \
protobuf-c/libprotobuf-c.la protobuf-c/libprotobuf-c.la
t/issue220/issue220.pb-c.c t/issue220/issue220.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/issue220/issue220.proto t/issue220/issue220.pb-c.c t/issue220/issue220.pb-c.h: $(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/issue220/issue220.proto
$(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/issue220/issue220.proto $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/issue220/issue220.proto
BUILT_SOURCES += \ BUILT_SOURCES += \
t/issue220/issue220.pb-c.c t/issue220/issue220.pb-c.h t/issue220/issue220.pb-c.c t/issue220/issue220.pb-c.h
EXTRA_DIST += \ EXTRA_DIST += \
...@@ -262,8 +262,8 @@ t_issue251_issue251_SOURCES = \ ...@@ -262,8 +262,8 @@ t_issue251_issue251_SOURCES = \
t/issue251/issue251.pb-c.c t/issue251/issue251.pb-c.c
t_issue251_issue251_LDADD = \ t_issue251_issue251_LDADD = \
protobuf-c/libprotobuf-c.la protobuf-c/libprotobuf-c.la
t/issue251/issue251.pb-c.c t/issue251/issue251.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/issue251/issue251.proto t/issue251/issue251.pb-c.c t/issue251/issue251.pb-c.h: $(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/issue251/issue251.proto
$(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/issue251/issue251.proto $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/issue251/issue251.proto
BUILT_SOURCES += \ BUILT_SOURCES += \
t/issue251/issue251.pb-c.c t/issue251/issue251.pb-c.h t/issue251/issue251.pb-c.c t/issue251/issue251.pb-c.h
EXTRA_DIST += \ EXTRA_DIST += \
...@@ -279,8 +279,8 @@ t_issue330_issue330_SOURCES = \ ...@@ -279,8 +279,8 @@ t_issue330_issue330_SOURCES = \
t/issue330/issue330.pb-c.c t/issue330/issue330.pb-c.c
t_issue330_issue330_LDADD = \ t_issue330_issue330_LDADD = \
protobuf-c/libprotobuf-c.la protobuf-c/libprotobuf-c.la
t/issue330/issue330.pb-c.c t/issue330/issue330.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/issue330/issue330.proto t/issue330/issue330.pb-c.c t/issue330/issue330.pb-c.h: $(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/issue330/issue330.proto
$(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/issue330/issue330.proto $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/issue330/issue330.proto
BUILT_SOURCES += \ BUILT_SOURCES += \
t/issue330/issue330.pb-c.c t/issue330/issue330.pb-c.h t/issue330/issue330.pb-c.c t/issue330/issue330.pb-c.h
EXTRA_DIST += \ EXTRA_DIST += \
...@@ -288,8 +288,8 @@ EXTRA_DIST += \ ...@@ -288,8 +288,8 @@ EXTRA_DIST += \
t_issue330_issue330_SOURCES += \ t_issue330_issue330_SOURCES += \
t/issue389/issue389.pb-c.c # Tack onto issue330 since there is no need for a separate binary here t/issue389/issue389.pb-c.c # Tack onto issue330 since there is no need for a separate binary here
t/issue389/issue389.pb-c.c t/issue389/issue389.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/issue389/issue389.proto t/issue389/issue389.pb-c.c t/issue389/issue389.pb-c.h: $(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/issue389/issue389.proto
$(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/issue389/issue389.proto $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/issue389/issue389.proto
BUILT_SOURCES += \ BUILT_SOURCES += \
t/issue389/issue389.pb-c.c t/issue389/issue389.pb-c.h t/issue389/issue389.pb-c.c t/issue389/issue389.pb-c.h
EXTRA_DIST += \ EXTRA_DIST += \
...@@ -305,8 +305,8 @@ t_issue375_issue375_SOURCES = \ ...@@ -305,8 +305,8 @@ t_issue375_issue375_SOURCES = \
t/issue375/issue375.pb-c.c t/issue375/issue375.pb-c.c
t_issue375_issue375_LDADD = \ t_issue375_issue375_LDADD = \
protobuf-c/libprotobuf-c.la protobuf-c/libprotobuf-c.la
t/issue375/issue375.pb-c.c t/issue375/issue375.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/issue375/issue375.proto t/issue375/issue375.pb-c.c t/issue375/issue375.pb-c.h: $(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/issue375/issue375.proto
$(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/issue375/issue375.proto $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/issue375/issue375.proto
BUILT_SOURCES += \ BUILT_SOURCES += \
t/issue375/issue375.pb-c.c t/issue375/issue375.pb-c.h t/issue375/issue375.pb-c.c t/issue375/issue375.pb-c.h
EXTRA_DIST += \ EXTRA_DIST += \
...@@ -322,8 +322,8 @@ t_issue440_issue440_SOURCES = \ ...@@ -322,8 +322,8 @@ t_issue440_issue440_SOURCES = \
t/issue440/issue440.pb-c.c t/issue440/issue440.pb-c.c
t_issue440_issue440_LDADD = \ t_issue440_issue440_LDADD = \
protobuf-c/libprotobuf-c.la protobuf-c/libprotobuf-c.la
t/issue440/issue440.pb-c.c t/issue440/issue440.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/issue440/issue440.proto t/issue440/issue440.pb-c.c t/issue440/issue440.pb-c.h: $(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/issue440/issue440.proto
$(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/issue440/issue440.proto $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/issue440/issue440.proto
BUILT_SOURCES += \ BUILT_SOURCES += \
t/issue440/issue440.pb-c.c t/issue440/issue440.pb-c.h t/issue440/issue440.pb-c.c t/issue440/issue440.pb-c.h
EXTRA_DIST += \ EXTRA_DIST += \
...@@ -339,8 +339,8 @@ t_issue745_issue745_SOURCES = \ ...@@ -339,8 +339,8 @@ t_issue745_issue745_SOURCES = \
t/issue745/issue745.pb-c.c t/issue745/issue745.pb-c.c
t_issue745_issue745_LDADD = \ t_issue745_issue745_LDADD = \
protobuf-c/libprotobuf-c.la protobuf-c/libprotobuf-c.la
t/issue745/issue745.pb-c.c t/issue745/issue745.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/issue745/issue745.proto t/issue745/issue745.pb-c.c t/issue745/issue745.pb-c.h: $(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/issue745/issue745.proto
$(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/issue745/issue745.proto $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/issue745/issue745.proto
BUILT_SOURCES += \ BUILT_SOURCES += \
t/issue745/issue745.pb-c.c t/issue745/issue745.pb-c.h t/issue745/issue745.pb-c.c t/issue745/issue745.pb-c.h
EXTRA_DIST += \ EXTRA_DIST += \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment