The existing Makefile seems to suppose the BSD environment. This patch renames existing Makefile into "Makefile.BSD" and adds "Makefile.GNU" for GNU environment.
Usage Example: - For BSD environment $ make -f Makefile.BSD - For GNU environment $ make -f Makefile.GNU Signed-off-by: IWASE Yusuke <[email protected]> --- ryu/tests/packet_data_generator2/Makefile | 35 ------------------------ ryu/tests/packet_data_generator2/Makefile.BSD | 35 ++++++++++++++++++++++++ ryu/tests/packet_data_generator2/Makefile.GNU | 39 +++++++++++++++++++++++++++ 3 files changed, 74 insertions(+), 35 deletions(-) delete mode 100644 ryu/tests/packet_data_generator2/Makefile create mode 100644 ryu/tests/packet_data_generator2/Makefile.BSD create mode 100644 ryu/tests/packet_data_generator2/Makefile.GNU diff --git a/ryu/tests/packet_data_generator2/Makefile b/ryu/tests/packet_data_generator2/Makefile deleted file mode 100644 index a6319c4..0000000 --- a/ryu/tests/packet_data_generator2/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright (C) 2015 Nippon Telegraph and Telephone Corporation. -# Copyright (C) 2015 YAMAMOTO Takashi <yamamoto at valinux co jp> -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# OVS: openvswitch installed directory (used to look for libraries) -# OVS_SRC: openvswitch source directory - -OVS?=${HOME}/ovs -OVS_SRC?=/disks/774373a2-e180-11e3-9fa1-08606e7f74e7/git/openvswitch - -CPPFLAGS+=-I${OVS}/include -I${OVS_SRC} -LDFLAGS+=-L${OVS}/lib -Wl,-R${OVS}/lib -lofproto -lopenvswitch - -PROG=gen -NOMAN= - -all: generate - -generate: ${PROG} - ${_MKMSG} "generate packet_data" - cd ${.CURDIR} && ${.OBJDIR}/${PROG} - -.include <bsd.prog.mk> diff --git a/ryu/tests/packet_data_generator2/Makefile.BSD b/ryu/tests/packet_data_generator2/Makefile.BSD new file mode 100644 index 0000000..a6319c4 --- /dev/null +++ b/ryu/tests/packet_data_generator2/Makefile.BSD @@ -0,0 +1,35 @@ +# Copyright (C) 2015 Nippon Telegraph and Telephone Corporation. +# Copyright (C) 2015 YAMAMOTO Takashi <yamamoto at valinux co jp> +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# OVS: openvswitch installed directory (used to look for libraries) +# OVS_SRC: openvswitch source directory + +OVS?=${HOME}/ovs +OVS_SRC?=/disks/774373a2-e180-11e3-9fa1-08606e7f74e7/git/openvswitch + +CPPFLAGS+=-I${OVS}/include -I${OVS_SRC} +LDFLAGS+=-L${OVS}/lib -Wl,-R${OVS}/lib -lofproto -lopenvswitch + +PROG=gen +NOMAN= + +all: generate + +generate: ${PROG} + ${_MKMSG} "generate packet_data" + cd ${.CURDIR} && ${.OBJDIR}/${PROG} + +.include <bsd.prog.mk> diff --git a/ryu/tests/packet_data_generator2/Makefile.GNU b/ryu/tests/packet_data_generator2/Makefile.GNU new file mode 100644 index 0000000..3e037f8 --- /dev/null +++ b/ryu/tests/packet_data_generator2/Makefile.GNU @@ -0,0 +1,39 @@ +# Copyright (C) 2015 Nippon Telegraph and Telephone Corporation. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# OVS_SRC: openvswitch source directory +# OVS_INC: openvswitch include directory +# OVS_LIB: openvswitch library directory + +OVS_SRC=${HOME}/ovs +OVS_INC=/usr/local/include/openvswitch +OVS_LIB=/usr/local/lib + +CPPFLAGS=-std=gnu99 -I${OVS_SRC} -I${OVS_INC} +LDFLAGS=-L${OVS_LIB} -Wl,-R${OVS_LIB} -lofproto -lopenvswitch -lpthread -lssl -lrt -lm -lcrypto + +PROG=gen +NOMAN= + +all: generate + +gen: gen.c + ${CC} $^ ${CPPFLAGS} ${LDFLAGS} -o $@ + +generate: ${PROG} + ./${PROG} + +clean: + rm ${PROG} -- 1.9.1 ------------------------------------------------------------------------------ _______________________________________________ Ryu-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ryu-devel
