make files should work now :)

AmmarkoV · Jan 13, 2013 · 2a9629d · 2a9629d
1 parent bcdafd2
commit 2a9629d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/README b/README
@@ -25,15 +25,16 @@ You can use the ./get-dependencies.sh to get the required packages for compiling
 
 --------------- Compilation ---------------
 To compile the project open a terminal and run
-./make
+make
 This will produce the executables ( flashyslideshows and flashyslideshowsgui )
 you can issue 
 ./flashyslideshowsgui
 
 
 --------------- Installation of current version---------------
 if you want to install the app , run 
-./install.sh
+./install.sh or
+sudo make install
 your password is required.. 
 This will add a shortcut on the applications list and the binaries flashyslideshowsgui and flashyslideshows on the system ..
 

diff --git a/install.sh b/install.sh
@@ -3,7 +3,7 @@ echo "Installation needs super user privileges.."
 sudo echo "..." 
 
 
-  ./make
+make
 
 if [ -d "/usr/share/flashyslideshows" ]; then
   echo "FlashySlideshows Installation detected , patching it up :)" 

diff --git a/makefile b/makefile
@@ -5,8 +5,10 @@
 
 WRKDIR = `pwd`
 MAKE = make 
+#SHELL="/bin/bash"
 
 INSTALLATIONSCRIPT:="./install.sh" 
+UNINSTALLATIONSCRIPT:="./uninstall.sh" 
 
 all: src_flashyslideshow src_flashyslideshowstarter_flashyslideshowstarter
 
@@ -23,6 +25,11 @@ install :
 	@echo "INSTALLATIONSCRIPT=$(INSTALLATIONSCRIPT)"
 	$(shell $(INSTALLATIONSCRIPT))
 
+.PHONY: uninstall
+uninstall :   
+	@echo "UNINSTALLATIONSCRIPT=$(UNINSTALLATIONSCRIPT)"
+	$(shell $(UNINSTALLATIONSCRIPT))
+
 clean_src_flashyslideshow: 
 	$(MAKE) -C src clean -f FlashySlideShow.cbp.mak
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ echo "Installation needs super user privileges.." @@
     sudo echo "..."
-      ./make
+    make
     if [ -d "/usr/share/flashyslideshows" ]; then
       echo "FlashySlideshows Installation detected , patching it up :)"
@@ Expand Down @@