Commits

Trammell Hudson committed a3ef683

Rename $(APP).bin to pebble-app.bin for compatability with libpebble?

Comments (0)

Files changed (1)

 	-L$(PEBBLE_HOME)/lib \
 	-lpebble \
 
+BUILD_TIME := $(shell date "+%s")
+
+ifeq ($(LIB),)
+# Force all executables to depend on our pebble library
+all: $O/$(APP).pbw
+else
+# Libraries do not depend on anything external
+all: $O/$(LIB)
+endif
+
 
 #
 # Convert the elf file to a binary file, with
 # the appended Pebble metadata.
 #
-%.bin: %.elf
+$O/pebble-app.bin: $O/pebble-app.elf
 	$(OBJCOPY) -O binary $< $@
 	$(PYTHON) $(PEBBLE_HOME)/waftools/inject_metadata.py $@
 
 # 
 # Bundle the binary (with pebble meta data) into an application.
 #
-BUILD_TIME := $(shell date "+%s")
 
-%.pbw: %.bin
+# Final step to link everything into the PBW file
+$O/$(APP).pbw: $O/pebble-app.bin
 	$(PYTHON) $(PEBBLE_HOME)/tools/mkbundle.py \
 		--watchapp $< \
 		--watchapp-timestamp $(BUILD_TIME) \
 		-o $@ \
 		-v \
 
-ifeq ($(LIB),)
-# Force all executables to depend on our pebble library
-all: $O/$(APP).pbw
-else
-# Libraries do not depend on anything external
-all: $O/$(LIB)
-endif
-
 
 
 #
 #$(eval $(info OBJS=$(OBJS)))
 
 $O/$(APP).pbw: $O/app_resources.pbpack
-$O/$(APP).elf: $(OBJS) $(LIBPEBBLE_TH)
+$O/pebble-app.elf: $(OBJS) $(LIBPEBBLE_TH)
 	$(LD) \
 		$(LDFLAGS) \
 		-o $@ \
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.