Change in simtrace2[master]: host: clean library dependencies
Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10826 ) Change subject: host: clean library dependencies .. host: clean library dependencies remsim also needs libpcsclite `pkg-config --libs libosmocore` and -losmocore are duplicates `pkg-config --libs libosmosim` is equivalent to -losmosim pthread it needed (by most applications) for static compilation LDFLAGS+= allows static compilation when running LDFLAGS="-static" make Change-Id: Ic7bd6f2be074d6f652d4f84f4996c8588ea5f851 --- M host/Makefile 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/host/Makefile b/host/Makefile index 7d5c7a4..aee399c 100644 --- a/host/Makefile +++ b/host/Makefile @@ -1,4 +1,4 @@ -LDFLAGS=`pkg-config --libs libusb-1.0 libosmocore` -losmocore +LDFLAGS+=`pkg-config --libs libusb-1.0 libosmocore` -pthread CFLAGS=-Wall -g APPS=simtrace2-remsim simtrace2-remsim-usb2udp simtrace2-list simtrace2-sniff @@ -6,7 +6,7 @@ all: $(APPS) simtrace2-remsim: simtrace2-remsim.o apdu_dispatch.o simtrace2-discovery.o libusb_util.o - $(CC) -o $@ $^ $(LDFLAGS) -losmosim + $(CC) -o $@ $^ $(LDFLAGS) `pkg-config --libs libosmosim libpcsclite` simtrace2-remsim-usb2udp: usb2udp.o simtrace2-discovery.o $(CC) -o $@ $^ $(LDFLAGS) -- To view, visit https://gerrit.osmocom.org/10826 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic7bd6f2be074d6f652d4f84f4996c8588ea5f851 Gerrit-Change-Number: 10826 Gerrit-PatchSet: 1 Gerrit-Owner: Kévin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102)
Change in simtrace2[master]: host: clean library dependencies
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10826 ) Change subject: host: clean library dependencies .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10826 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic7bd6f2be074d6f652d4f84f4996c8588ea5f851 Gerrit-Change-Number: 10826 Gerrit-PatchSet: 1 Gerrit-Owner: Kévin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Comment-Date: Fri, 07 Sep 2018 06:31:35 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in simtrace2[master]: host: clean library dependencies
Kévin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/10826 Change subject: host: clean library dependencies .. host: clean library dependencies remsim also needs libpcsclite `pkg-config --libs libosmocore` and -losmocore are duplicates `pkg-config --libs libosmosim` is equivalent to -losmosim pthread it needed (by most applications) for static compilation LDFLAGS+= allows static compilation when running LDFLAGS="-static" make Change-Id: Ic7bd6f2be074d6f652d4f84f4996c8588ea5f851 --- M host/Makefile 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/26/10826/1 diff --git a/host/Makefile b/host/Makefile index 7d5c7a4..aee399c 100644 --- a/host/Makefile +++ b/host/Makefile @@ -1,4 +1,4 @@ -LDFLAGS=`pkg-config --libs libusb-1.0 libosmocore` -losmocore +LDFLAGS+=`pkg-config --libs libusb-1.0 libosmocore` -pthread CFLAGS=-Wall -g APPS=simtrace2-remsim simtrace2-remsim-usb2udp simtrace2-list simtrace2-sniff @@ -6,7 +6,7 @@ all: $(APPS) simtrace2-remsim: simtrace2-remsim.o apdu_dispatch.o simtrace2-discovery.o libusb_util.o - $(CC) -o $@ $^ $(LDFLAGS) -losmosim + $(CC) -o $@ $^ $(LDFLAGS) `pkg-config --libs libosmosim libpcsclite` simtrace2-remsim-usb2udp: usb2udp.o simtrace2-discovery.o $(CC) -o $@ $^ $(LDFLAGS) -- To view, visit https://gerrit.osmocom.org/10826 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic7bd6f2be074d6f652d4f84f4996c8588ea5f851 Gerrit-Change-Number: 10826 Gerrit-PatchSet: 1 Gerrit-Owner: Kévin Redon