# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1525707428 -10800
# Node ID 2e0fcb3d0b95db7ff8f6c15828c46c25a474399a
# Parent  20ce1339f36b3dc70f366260f33e20f5e9a76c56# Parent  4a993456df9f0ee61134b4fb7783a2d147f82b13
Merged.

diff -r 20ce1339f36b -r 2e0fcb3d0b95 Makefile.cross-mingw-win32
--- a/Makefile.cross-mingw-win32	Mon May 07 18:36:55 2018 +0300
+++ b/Makefile.cross-mingw-win32	Mon May 07 18:37:08 2018 +0300
@@ -48,6 +48,6 @@
 QT_UIC = $(QT5_BASE)/bin/uic
 QT_UIC_FLAGS =
 
-CLEAN_TARGETS += moc_predefs.h $(APP_SRC)winres.rc
+CLEAN_TARGETS += moc_predefs.h src/winres.rc
 
 include Makefile.gen
diff -r 20ce1339f36b -r 2e0fcb3d0b95 Makefile.gen
--- a/Makefile.gen	Mon May 07 18:36:55 2018 +0300
+++ b/Makefile.gen	Mon May 07 18:37:08 2018 +0300
@@ -19,17 +19,22 @@
 MKDIR_P ?= $(MKDIR) -p
 
 # Common defines
-DEFINES += -DQT_DEPRECATED_WARNINGS -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_SQL_LIB -DQT_CORE_LIB
+DEFINES += -DQT_DEPRECATED_WARNINGS -DQT_NO_DEBUG \
+	-DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_SQL_LIB \
+	-DQT_CORE_LIB
 
 # Application stuff
-APP_SRC=src/
 APP_IMG=img/
 APP_BIN=$(BINPATH)Syntilista$(EXEEXT)
+
+APP_HDRS=\
+	src/main.h \
+	src/ui_viewtransactions.h \
+	src/ui_mainwindow.h \
+	src/ui_editperson.h \
+	src/ui_aboutwindow.h
+
 APP_OBJS=main.o sqlmodels.o printing.o resources.o moc_main.o runguard.o
-APP_VERSION := $(shell cat VERSION)
-comma:= ,
-APP_VERSION_COM := $(subst .,$(comma),$(APP_VERSION))
-CXXFLAGS += -DAPP_VERSION=\"$(APP_VERSION)\"
 
 LOGO_SVG ?= kampuscafe4.svg
 LOGO_IMG ?= CafeKampus_logo_FINAL_RGB.png
@@ -37,15 +42,21 @@
 
 APP_RESOURCES += $(addprefix $(APP_IMG),logo.png $(ICON_PNGS)) COPYING.html
 
-
 # And target lists
 TARGETS = $(APP_BIN)
 NOBUILD_TARGETS += $(OBJPATH) $(BINPATH)
 NOINST_TARGETS += 
-CLEAN_TARGETS += icon.ico $(APP_SRC)moc_*.cpp $(APP_SRC)ui_*.h
+CLEAN_TARGETS += icon.ico src/moc_*.cpp src/ui_*.h
 DISTCLEAN_TARGETS += 
 
 
+# Version
+APP_VERSION := $(shell cat VERSION)
+comma:= ,
+APP_VERSION_COM := $(subst .,$(comma),$(APP_VERSION))
+CXXFLAGS += -DAPP_VERSION=\"$(APP_VERSION)\"
+
+
 ###
 ### Target rules
 ###
@@ -69,11 +80,11 @@
 	@echo " MKDIR $@"
 	@$(MKDIR_P) $@
 
-$(OBJPATH)%.o: $(APP_SRC)%.cpp $(APP_SRC)%.h
+$(OBJPATH)%.o: src/%.cpp src/%.h
 	@echo " CXX $@"
 	@$(CXX) $(CXXFLAGS) $(DEFINES) $(INCPATH) -c -o $@ $<
 
-$(OBJPATH)%.o: $(APP_SRC)%.cpp
+$(OBJPATH)%.o: src/%.cpp
 	@echo " CXX $@"
 	@$(CXX) $(CXXFLAGS) $(DEFINES) $(INCPATH) -c -o $@ $<
 
@@ -85,7 +96,7 @@
 %.rc: %.rc.in icon.ico VERSION
 	@sed -e "s/@APP_VERSION@/$(APP_VERSION)/g;s/@APP_VERSION_COM@/$(APP_VERSION_COM)/g;s#@APP_EXE@#$(notdir $(APP_BIN))#g" < $< > $@
 
-$(OBJPATH)%.o: $(APP_SRC)%.rc
+$(OBJPATH)%.o: src/%.rc
 	@echo " WINDRES $<"
 	@$(WINDRES) $< -O coff -o $@
 
@@ -109,11 +120,11 @@
 	@echo " CONVERT $+ -> $@"
 	@convert $+ $@
 
-$(APP_SRC)%.cpp: $(APP_SRC)%.qrc $(APP_RESOURCES)
+src/%.cpp: src/%.qrc $(APP_RESOURCES)
 	@echo " Qt:RCC $@ $<"
 	@$(QT_RCC) -name "Syntilista" $< -o $@
 
-$(OBJPATH)main.o: $(addprefix $(APP_SRC),main.cpp main.h ui_viewtransactions.h ui_mainwindow.h ui_editperson.h ui_aboutwindow.h) VERSION
+$(OBJPATH)main.o: src/main.cpp $(APP_HDRS) VERSION
 	@echo " CXX $@"
 	@$(CXX) $(CXXFLAGS) $(DEFINES) $(INCPATH) -c -o $@ $<