diff --git a/app/Makefile b/app/Makefile index 8275a264..64c92a5e 100644 --- a/app/Makefile +++ b/app/Makefile @@ -39,7 +39,8 @@ SUBDIRS= \ spiffs \ cjson \ crypto \ - dhtlib + dhtlib \ + tsl2561 endif # } PDIR @@ -90,7 +91,9 @@ COMPONENTS_eagle.app.v6 = \ cjson/libcjson.a \ crypto/libcrypto.a \ dhtlib/libdhtlib.a \ - modules/libmodules.a + tsl2561/tsl2561lib.a \ + modules/libmodules.a + LINKFLAGS_eagle.app.v6 = \ -L../lib \ diff --git a/app/modules/modules.h b/app/modules/modules.h index db5a8b8b..b4bc09ed 100644 --- a/app/modules/modules.h +++ b/app/modules/modules.h @@ -257,5 +257,5 @@ ROM_MODULES_RTCFIFO \ ROM_MODULES_SNTP \ ROM_MODULES_BMP085 \ - ROM_MODULES_TSL2561 \ + ROM_MODULES_TSL2561 #endif diff --git a/app/tsl2561/Makefile b/app/tsl2561/Makefile new file mode 100644 index 00000000..34d6e7dc --- /dev/null +++ b/app/tsl2561/Makefile @@ -0,0 +1,49 @@ + +############################################################# +# Required variables for each makefile +# Discard this section from all parent makefiles +# Expected variables (with automatic defaults): +# CSRCS (all "C" files in the dir) +# SUBDIRS (all subdirs with a Makefile) +# GEN_LIBS - list of libs to be generated () +# GEN_IMAGES - list of images to be generated () +# COMPONENTS_xxx - a list of libs/objs in the form +# subdir/lib to be extracted and rolled up into +# a generated lib/image xxx.a () +# +ifndef PDIR +GEN_LIBS = tsl2561lib.a +endif + + +############################################################# +# Configuration i.e. compile options etc. +# Target specific stuff (defines etc.) goes in here! +# Generally values applying to a tree are captured in the +# makefile at its root level - these are then overridden +# for a subtree within the makefile rooted therein +# +#DEFINES += + +############################################################# +# Recursion Magic - Don't touch this!! +# +# Each subtree potentially has an include directory +# corresponding to the common APIs applicable to modules +# rooted at that subtree. Accordingly, the INCLUDE PATH +# of a module can only contain the include directories up +# its parent path, and not its siblings +# +# Required for each makefile to inherit from the parent +# + +INCLUDES := $(INCLUDES) -I $(PDIR)include +INCLUDES += -I ./ +INCLUDES += -I ./include +INCLUDES += -I ../include +INCLUDES += -I ../../include +INCLUDES += -I ../libc +INCLUDES += -I ../platform +PDIR := ../$(PDIR) +sinclude $(PDIR)Makefile +