From 2f4d14b7e8a62b4328bc45383ae1dc2447ff555b Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Tue, 7 Jul 2015 15:46:34 -0400
Subject: [PATCH] screen_savers/Nebula: Switch to using a Jamfile.

---
 src/add-ons/screen_savers/Jamfile         |  1 +
 src/add-ons/screen_savers/nebula/Jamfile  | 10 ++++++
 src/add-ons/screen_savers/nebula/makefile | 40 -----------------------
 3 files changed, 11 insertions(+), 40 deletions(-)
 create mode 100644 src/add-ons/screen_savers/nebula/Jamfile
 delete mode 100644 src/add-ons/screen_savers/nebula/makefile

diff --git a/src/add-ons/screen_savers/Jamfile b/src/add-ons/screen_savers/Jamfile
index 1bf5874376..031c70dc0c 100644
--- a/src/add-ons/screen_savers/Jamfile
+++ b/src/add-ons/screen_savers/Jamfile
@@ -10,6 +10,7 @@ SubInclude HAIKU_TOP src add-ons screen_savers icons ;
 SubInclude HAIKU_TOP src add-ons screen_savers ifs ;
 SubInclude HAIKU_TOP src add-ons screen_savers leaves ;
 SubInclude HAIKU_TOP src add-ons screen_savers message ;
+SubInclude HAIKU_TOP src add-ons screen_savers nebula ;
 SubInclude HAIKU_TOP src add-ons screen_savers shelf ;
 SubInclude HAIKU_TOP src add-ons screen_savers simpleclock ;
 SubInclude HAIKU_TOP src add-ons screen_savers slideshowsaver ;
diff --git a/src/add-ons/screen_savers/nebula/Jamfile b/src/add-ons/screen_savers/nebula/Jamfile
new file mode 100644
index 0000000000..acaca0f9e4
--- /dev/null
+++ b/src/add-ons/screen_savers/nebula/Jamfile
@@ -0,0 +1,10 @@
+SubDir HAIKU_TOP src add-ons screen_savers nebula ;
+
+SubDirC++Flags -funroll-loops -fomit-frame-pointer -fexpensive-optimizations -Wno-error ;
+
+AddResources Nebula : Nebula.rdef ;
+
+ScreenSaver Nebula :
+	Nebula.cpp :
+	be libscreensaver.so [ TargetLibsupc++ ]
+;
diff --git a/src/add-ons/screen_savers/nebula/makefile b/src/add-ons/screen_savers/nebula/makefile
deleted file mode 100644
index 9e6d0ab932..0000000000
--- a/src/add-ons/screen_savers/nebula/makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-#include $(TOP)/config/make.cfg
-
-CFLAGS	= -O3 -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations
-#CFLAGS = -g
-
-LIBS	= -lbe -lscreensaver
-NAME	= Nebula
-FILES 	= Nebula
-ASMFILES =
-OBJDIR	= obj.x86
-
-STARFILES	:= $(foreach f, $(STARWIDTHS), $(STARFILE)$(f))
-
-SRCS 		:= $(foreach f, $(FILES), $(f).cpp)
-ASMSRCS		:= $(foreach f, $(ASMFILES), $(f).S)
-
-OBJS 		:= $(foreach f, $(FILES) $(ASMFILES) $(STARFILES), $(OBJDIR)/$(f).o)
-
-all:	$(NAME)
-
-install: all
-	@mv $(NAME) /boot/home/config/add-ons/Screen\ Savers/
-
-test: all
-	@screen_blanker /boot/home/develop/div/ScreenSavers/$(NAME)/$(NAME)
-
-clean:
-	@rm $(OBJDIR)/*
-
-Nebula: $(OBJS)
-	@echo "Linking $@..."
-	@$(CC) $(OBJS) -o $@ -nostart $(LIBS)
-	xres -o $@ $@.rsrc
-	mimeset -f $@
-
-$(OBJDIR)/%.o : %.cpp
-	$(CC) -c $*.cpp -o $(OBJDIR)/$*.o $(CFLAGS)
-
-tar zip backup:
-	@zip `basename $(NAME)`-`date +%Y-%m-%d`.zip *.[chS]* *.rsrc makefile