fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/31800 ) Change subject: ipc-driver-test: clean up variables in Makefile.am ...................................................................... ipc-driver-test: clean up variables in Makefile.am * AM_CPPFLAGS is for preprocessor flags like '-I' or '-D', * AM_CFLAGS/AM_CXXFLAGS is for C/C++ compiler flags like '-Wall', * AM_LDFLAGS is for linker flags like '-no-undefined', not libraries! * Link ipc-driver-test against libdevice.la, * Do not put $(UHD_CFLAGS) everywhere. Change-Id: Iafd68974c9c613fb4e65a01d076b2c687b716c83 --- M Transceiver52M/device/ipc/Makefile.am 1 file changed, 24 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/00/31800/1 diff --git a/Transceiver52M/device/ipc/Makefile.am b/Transceiver52M/device/ipc/Makefile.am index 1653663..5b3be60 100644 --- a/Transceiver52M/device/ipc/Makefile.am +++ b/Transceiver52M/device/ipc/Makefile.am @@ -1,9 +1,8 @@ include $(top_srcdir)/Makefile.common -AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/../common -AM_CFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) -AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) -AM_LDFLAGS = -lpthread -lrt +AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/../common +AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(UHD_CFLAGS) +AM_CXXFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(UHD_CFLAGS) noinst_HEADERS = IPCDevice.h shm.h ipc_shm.h ipc_chan.h ipc_sock.h @@ -21,15 +20,13 @@ bin_PROGRAMS = ipc-driver-test #ipc_driver_test_SHORTNAME = drvt -ipc_driver_test_SOURCES = ipc-driver-test.c uhdwrap.cpp ipc_shm.c ipc_chan.c ipc_sock.c ../uhd/UHDDevice.cpp +ipc_driver_test_SOURCES = ipc-driver-test.c uhdwrap.cpp ../uhd/UHDDevice.cpp ipc_driver_test_LDADD = \ - shm.lo \ - $(top_builddir)/Transceiver52M/device/common/libdevice_common.la \ - $(COMMON_LA) + libdevice.la \ + $(COMMON_LA) \ $(LIBOSMOCORE_LIBS) \ + $(UHD_LIBS) \ + -lpthread \ + -lrt \ $(NULL) -ipc_driver_test_CXXFLAGS = $(AM_CXXFLAGS) $(UHD_CFLAGS) -ipc_driver_test_CPPFLAGS = $(AM_CPPFLAGS) $(UHD_CFLAGS) -ipc_driver_test_CFLAGS = $(AM_CFLAGS) $(UHD_CFLAGS) -ipc_driver_test_LDFLAGS = $(AM_LDFLAGS) $(UHD_LIBS) endif -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/31800 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Iafd68974c9c613fb4e65a01d076b2c687b716c83 Gerrit-Change-Number: 31800 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> Gerrit-MessageType: newchange