Move components from subdirectory to top level

Makefile.in

@@ -21,40 +21,40 @@ graphics:
 # use predefined image 800x600 with logo
 	cp -al images/boot.png images/grub.png
 # product logo for ahttpd
-	cp -al images/product-logo.png components/ahttpd/images/product-logo.png
+	cp -al images/product-logo.png ahttpd/images/product-logo.png
 # product logo for indexhtml
-	cp -al images/product-logo.png components/indexhtml/images/product-logo.png
+	cp -al images/product-logo.png indexhtml/images/product-logo.png
 
 # browser-qt
 
-components/browser-qt/design/bg.png: images/installer.png
+browser-qt/design/bg.png: images/installer.png
 	convert $<  -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -gravity northeast -draw 'text 25,25 "$(STATUS)"' $@
 
-browser-qt:components/browser-qt/design/bg.png
+browser-qt:browser-qt/design/bg.png
 	install -d $(datadir)/alterator-browser-qt/design
-	rcc-qt4 -binary components/browser-qt/theme.qrc -o $(datadir)/alterator-browser-qt/design/$(THEME).rcc
+	rcc-qt4 -binary browser-qt/theme.qrc -o $(datadir)/alterator-browser-qt/design/$(THEME).rcc
-	#cp -f components/browser-qt/design/design-live.qss components/browser-qt/design/design.qss
+	#cp -f browser-qt/design/design-live.qss browser-qt/design/design.qss
-	rcc-qt4 -binary components/browser-qt/theme.qrc -o $(datadir)/alterator-browser-qt/design/$(THEME)-live.rcc
+	rcc-qt4 -binary browser-qt/theme.qrc -o $(datadir)/alterator-browser-qt/design/$(THEME)-live.rcc
 	install -d $(sysconfdir)/alternatives/packages.d
 	printf '/etc/alterator/design-browser-qt\t/usr/share/alterator-browser-qt/design/$(THEME).rcc\t50\n'>$(sysconfdir)/alternatives/packages.d/$(THEME).rcc
 
 # ahttpd
 
 ahttpd:
-	for i in components/ahttpd/images/*.svg; do \
+	for i in ahttpd/images/*.svg; do \
 	    image=$${i%.svg}; \
 	    convert -background none $$image.svg $$image.png ; \
 	done
 	install -d $(datadir)/alterator/design/styles
-	cp -a components/ahttpd/images $(datadir)/alterator/design
+	cp -a ahttpd/images $(datadir)/alterator/design
-	cp -a components/ahttpd/styles/*.css $(datadir)/alterator/design/styles
+	cp -a ahttpd/styles/*.css $(datadir)/alterator/design/styles
 
 # bootloader and bootsplash
 boot-images:
 	cp -a  /usr/src/design-bootloader-source ./
-	cp -a components/bootloader/config design-bootloader-source/
+	cp -a bootloader/config design-bootloader-source/
-	cp -a components/bootloader/gfxboot.cfg design-bootloader-source/data-install/
+	cp -a bootloader/gfxboot.cfg design-bootloader-source/data-install/
-	cp -a components/bootloader/gfxboot.cfg design-bootloader-source/data-boot/
+	cp -a bootloader/gfxboot.cfg design-bootloader-source/data-boot/
 	#for size in 1024x768 800x600 640x480; do \
 	#	convert images/boot.jpg -quality 97 -resize "$$size!" -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -gravity northeast -draw 'text 25,25 "$(STATUS)"' boot-$$size.jpg ;\
 	#done
@@ -72,7 +72,7 @@ boot-splash: boot-images
 	cp -al images/grub.jpg $(datadir)/plymouth/themes/$(THEME)/grub.jpg
 	# Put logo to background*x*.png
 	cp -al images/with-logo/background*x*.png $(datadir)/plymouth/themes/$(THEME)/
-	cp -a components/bootsplash/* $(datadir)/plymouth/themes/$(THEME)
+	cp -a bootsplash/* $(datadir)/plymouth/themes/$(THEME)
 	mv $(datadir)/plymouth/themes/$(THEME)/theme.plymouth $(datadir)/plymouth/themes/$(THEME)/$(THEME).plymouth
 	rm -f $(datadir)/plymouth/themes/$(THEME)/*.in
 #bootloader
@@ -82,30 +82,30 @@ boot: boot-images
 	install -d -m 755 $(datadir)/gfxboot/$(THEME)
 	install -m 644 design-bootloader-source/message $(sysconfdir)/../boot/splash/$(THEME)
 	install -m 644 design-bootloader-source/bootlogo $(datadir)/gfxboot/$(THEME)
-	#install -m644 components/bootloader/bootlogo $(datadir)/gfxboot/$(THEME)
+	#install -m644 bootloader/bootlogo $(datadir)/gfxboot/$(THEME)
 #grub2
-	convert -size 16x16 -define png:color-type=2 -depth 8 xc:'#268BD2' components/grub2/selected_blob_c.png
+	convert -size 16x16 -define png:color-type=2 -depth 8 xc:'#268BD2' grub2/selected_blob_c.png
 	install -d -m 755  $(sysconfdir)/../boot/grub/themes/$(THEME)
-	cp -a components/grub2/* $(sysconfdir)/../boot/grub/themes/$(THEME)/
+	cp -a grub2/* $(sysconfdir)/../boot/grub/themes/$(THEME)/
 	install -m 644 images/boot.png $(sysconfdir)/../boot/grub/themes/$(THEME)/boot.png
 	install -m 644 images/boot.jpg $(sysconfdir)/../boot/grub/themes/$(THEME)/grub.jpg
 
 # index html page, start page for all local browsers
-components/indexhtml/index.css:
+indexhtml/index.css:
-	sed 's|/design/|file:///usr/share/alterator/design/|g' components/ahttpd/styles/alterator.css > components/indexhtml/index.css
+	sed 's|/design/|file:///usr/share/alterator/design/|g' ahttpd/styles/alterator.css > indexhtml/index.css
 
 INDEXHTML_DIR=$(datadir)/doc/indexhtml
-indexhtml: components/indexhtml/index.css
+indexhtml: indexhtml/index.css
-	for i in components/indexhtml/*.html components/indexhtml/*.css;do \
+	for i in indexhtml/*.html indexhtml/*.css;do \
 	  install -Dpm644 $$i $(INDEXHTML_DIR)/`basename $$i`; \
 	done
 	install -Dpm644 /dev/null $(INDEXHTML_DIR)/index.html
-	cp -a components/indexhtml/images $(INDEXHTML_DIR)
+	cp -a indexhtml/images $(INDEXHTML_DIR)
 	for i in alt-docs documentation;do \
 	  ln -s /usr/share/doc/$$i $(INDEXHTML_DIR)/$$i; \
 	done
-	install -Dpm644 components/indexhtml/indexhtml.desktop $(datadir)/applications/indexhtml.desktop
+	install -Dpm644 indexhtml/indexhtml.desktop $(datadir)/applications/indexhtml.desktop
-	install -Dpm755 components/indexhtml/indexhtml.desktop $(datadir)/kde4/apps/kio_desktop/DesktopLinks/indexhtml.desktop
+	install -Dpm755 indexhtml/indexhtml.desktop $(datadir)/kde4/apps/kio_desktop/DesktopLinks/indexhtml.desktop
 
 all: graphics
-install: all browser-qt ahttpd boot-images boot-splash @X86@ indexhtml
+install: browser-qt ahttpd boot-images boot-splash @X86@ indexhtml