X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin3_src%2FWM%2FMakefile;h=5854a3959e1e923a5e7f1f0b85b6e481355bb56f;hb=d9b454656314400cf673ac7cb2923ac0f2bbd676;hp=4150e9457341199044f591a969d424e251729b47;hpb=6457e97e47fa29a23975daf853a3c032ce6650ef;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/axwin3_src/WM/Makefile b/Usermode/Applications/axwin3_src/WM/Makefile
index 4150e945..5854a395 100644
--- a/Usermode/Applications/axwin3_src/WM/Makefile
+++ b/Usermode/Applications/axwin3_src/WM/Makefile
@@ -2,32 +2,13 @@
 
 -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
-OBJ += wm.o wm_input.o wm_render.o wm_render_text.o wm_hotkeys.o
-OBJ += decorator.o
-OBJ += renderers/framebuffer.o
-OBJ += renderers/background.o
-OBJ += renderers/menu.o
-OBJ += renderers/richtext.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
-OBJ += renderers/widget/subwin.o
-
-PNGIMAGES := toolbar_new.png
-
-LDFLAGS += -limage_sif -luri -lnet -lunicode
-
-IMG2SIF = ../../../../Tools/img2sif
+OBJ := main.o input.o video.o ipc_acess.o
+include common.mk
+
+LDFLAGS += -lnet
 
 -include ../../Makefile.tpl
 
@@ -35,19 +16,8 @@ IMG2SIF = ../../../../Tools/img2sif
 
 install: install_resources
 
-#all: resources/LogoSmall.sif.res.h
-
-%.res.h: % Makefile
-	echo "#define RESOURCE_$(notdir $<) \\"| sed -e 's/\./_/g' > $@
-	base64 $< | sed -e 's/.*/"&"\\/' >> $@
-	echo "" >> $@
-
-$(IMG2SIF):
-	$(MAKE) -C $(dir $(IMG2SIF)) img2sif
-
-install_%.sif: resources/%.png
-	@echo img2sif resources/$*.png
-	@$(IMG2SIF) resources/$*.png resources/.$*.sif
-	@$(xCP) resources/.$*.sif $(DISTROOT)/$(DIR)/$*.sif
+install_%.sif: resources/.%.sif ;
+	@echo [xCP] $(DISTROOT)/$(DIR)/$*.sif
+	@$(xCP) $< $(DISTROOT)/$(DIR)/$*.sif
 
 install_resources: $(IMG2SIF) $(addprefix install_,$(PNGIMAGES:%.png=%.sif))