Wed, 30 Jan 2019 16:40:23 +0100
Added two missing fields in getfermentablesources.php. When getting a single recipe from the database, update the fermentables json data with available inventory and ingredient. Added inventory column in the fermentable grid. Added ingredient selection in the fermentable popup window to replace ingredient.
# Makefile for the mbsePi-apps/thermferm. include ../Makefile.global SRCS = $(wildcard *.c) HDRS = $(wildcard *.h) OBJS = $(SRCS:.c=.o) SLIBS = -lpthread TARGET = bmsd OTHER = Makefile ############################################################################# .c.o: ${CC} ${CFLAGS} ${INCLUDES} ${DEFINES} -c $< all: ${TARGET} bmsd: ${OBJS} ${SLIBS} ${CC} -o bmsd ${OBJS} ${LDFLAGS} ${LIBS} ${SLIBS} clean: rm -f ${TARGET} *.o *.h~ *.c~ core filelist Makefile.bak install: all ${INSTALL} -d -g 314 -o 314 ${PREFIX} ${BINDIR} ${INSTALL} -c -s -g 314 -o 314 -m 0755 bmsd ${BINDIR} filelist: Makefile BASE=`pwd`; \ BASE=`basename $${BASE}`; \ (for f in ${SRCS} ${HDRS} ${OTHER} ;do echo ${PACKAGE}-${VERSION}/$${BASE}/$$f; done) >filelist depend: @rm -f Makefile.bak; \ mv Makefile Makefile.bak; \ sed -e '/^# DO NOT DELETE/,$$d' Makefile.bak >Makefile; \ ${ECHO} '# DO NOT DELETE THIS LINE - MAKE DEPEND RELIES ON IT' \ >>Makefile; \ ${ECHO} '# Dependencies generated by make depend' >>Makefile; \ for f in ${SRCS}; \ do \ ${ECHO} "Dependencies for $$f:\c"; \ ${ECHO} "`basename $$f .c`.o:\c" >>Makefile; \ for h in `sed -n -e \ 's/^#[ ]*include[ ]*"\([^"]*\)".*/\1/p' $$f`; \ do \ ${ECHO} " $$h\c"; \ ${ECHO} " $$h\c" >>Makefile; \ done; \ ${ECHO} " done."; \ ${ECHO} "" >>Makefile; \ done; \ ${ECHO} '# End of generated dependencies' >>Makefile # DO NOT DELETE THIS LINE - MAKE DEPEND RELIES ON IT # Dependencies generated by make depend mqtt.o: bms.h xutil.h mqtt.h nodes.h fermenters.h lock.o: lock.h bms.h futil.h nodes.o: bms.h xutil.h nodes.h mysql.h futil.o: bms.h futil.h fermenters.o: bms.h xutil.h fermenters.h mysql.h bms.o: bms.h xutil.h futil.h rdconfig.h lock.h mqtt.h mysql.h xutil.o: bms.h xutil.h rdconfig.o: bms.h xutil.h futil.h rdconfig.h mysql.o: bms.h xutil.h mysql.h nodes.h # End of generated dependencies