nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gluon-mesh-babel: fix respondd provider build/install

Browse Source 
Rename to respondd.c / respondd.so, gluon.mk expects these names. This way
we can remove the install code. The installed filename is changed to
gluon-mesh-babel.so, bringing it in line with out common naming scheme.
This commit is contained in:
Matthias Schiffer 2018-11-17 19:45:18 +01:00
parent 7620d41c29
commit af9c1f7e9f
No known key found for this signature in database
GPG Key ID: 16EF3F64CB201D9C
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package/gluon-mesh-babel/Makefile
View File

@ -17,9 +17,6 @@ endef
define Package/gluon-mesh-babel/install define Package/gluon-mesh-babel/install
$(Gluon/Build/Install) $(Gluon/Build/Install)
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_DIR) $(1)/usr/lib/respondd
$(CP) $(PKG_BUILD_DIR)/babel-respondd.so $(1)/usr/lib/respondd/mesh-babel.so
$(INSTALL_DIR) $(1)/lib/gluon/status-page/providers $(INSTALL_DIR) $(1)/lib/gluon/status-page/providers
$(INSTALL_BIN) $(PKG_BUILD_DIR)/neighbours-babel $(1)/lib/gluon/status-page/providers/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/neighbours-babel $(1)/lib/gluon/status-page/providers/
endef endef

4
package/gluon-mesh-babel/src/Makefile
View File

@ -1,4 +1,4 @@
all: babel-respondd.so neighbours-babel all: respondd.so neighbours-babel
CFLAGS += -Wall -g -fPIC -D_GNU_SOURCE CFLAGS += -Wall -g -fPIC -D_GNU_SOURCE
@ -24,7 +24,7 @@ CFLAGS_JSONC = $(shell pkg-config --cflags json-c)
LDFLAGS_JSONC = $(shell pkg-config --libs json-c) LDFLAGS_JSONC = $(shell pkg-config --libs json-c)
babel-respondd.so: babel-respondd.c handle_neighbour.c respondd.so: respondd.c handle_neighbour.c
$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(LDLIBS) -shared $(LDFLAGS_JSONC) -o $@ $^ -lgluonutil -lblobmsg_json -lubox -lubus -liwinfo -luci $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(LDLIBS) -shared $(LDFLAGS_JSONC) -o $@ $^ -lgluonutil -lblobmsg_json -lubox -lubus -liwinfo -luci
neighbours-babel: neighbours-babel.c handle_neighbour.c neighbours-babel: neighbours-babel.c handle_neighbour.c

0
package/gluon-mesh-babel/src/babel-respondd.c → package/gluon-mesh-babel/src/respondd.c
View File