X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin3_src%2FWM%2FMakefile;h=5854a3959e1e923a5e7f1f0b85b6e481355bb56f;hb=91a13665236dfe9f0c053eb49d8ab60a6476f9ad;hp=fae6cbefad9a3264608ddb66c0e26db7977e4b55;hpb=305bad29632e0cf47307e010ae7dea55617f2dfd;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/axwin3_src/WM/Makefile b/Usermode/Applications/axwin3_src/WM/Makefile
index fae6cbef..5854a395 100644
--- a/Usermode/Applications/axwin3_src/WM/Makefile
+++ b/Usermode/Applications/axwin3_src/WM/Makefile
@@ -2,32 +2,22 @@
 
 -include ../../Makefile.cfg
 
-CPPFLAGS += -I include/ -I ../include/
-CFLAGS += -std=gnu99
 
 DIR := Apps/AxWin/3.0
 BIN := AxWinWM
-OBJ := main.o input.o video.o ipc.o image.o utf-8.o
-OBJ += wm.o wm_input.o wm_render.o wm_render_text.o wm_hotkeys.o
-OBJ += decorator.o
-OBJ += renderers/passthru.o
-OBJ += renderers/background.o
-OBJ += renderers/menu.o
-# TODO: Move to a lower makefile
-OBJ += renderers/widget.o
-OBJ += renderers/widget/button.o
-OBJ += renderers/widget/image.o
-OBJ += renderers/widget/disptext.o
-OBJ += renderers/widget/textinput.o
-OBJ += renderers/widget/spacer.o
-
-LDFLAGS += -limage_sif -luri -lnet
+OBJ := main.o input.o video.o ipc_acess.o
+include common.mk
+
+LDFLAGS += -lnet
 
 -include ../../Makefile.tpl
 
-#all: resources/LogoSmall.sif.res.h
+.PHONY: install_resources
+
+install: install_resources
+
+install_%.sif: resources/.%.sif ;
+	@echo [xCP] $(DISTROOT)/$(DIR)/$*.sif
+	@$(xCP) $< $(DISTROOT)/$(DIR)/$*.sif
 
-%.res.h: % Makefile
-	echo "#define RESOURCE_$(notdir $<) \\"| sed -e 's/\./_/g' > $@
-	base64 $< | sed -e 's/.*/"&"\\/' >> $@
-	echo "" >> $@
+install_resources: $(IMG2SIF) $(addprefix install_,$(PNGIMAGES:%.png=%.sif))