Added crosscompile env var to ar and ranlib too

[pandora-libraries.git] / Makefile

diff --git a/Makefile b/Makefile
index 6260563..f2122a4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,9 +4,9 @@
 #
 
 # tools
-CC = gcc
-AR = ar
-RANLIB = ranlib
+CC = ${CROSSCOMPILE}gcc
+AR = ${CROSSCOMPILE}ar
+RANLIB = ${CROSSCOMPILE}ranlib
 RM = rm
 
 # environment
@@ -20,12 +20,13 @@ LIB = libpnd.a
 SOLIB = libpnd.so.1         # canonicle name
 SOLIB1 = libpnd.so.1.0.1    # versioned name
 XMLOBJ = lib/tinyxml/tinystr.o lib/tinyxml/tinyxml.o lib/tinyxml/tinyxmlerror.o lib/tinyxml/tinyxmlparser.o
-ALLOBJ = pnd_conf.o pnd_container.o pnd_discovery.o pnd_pxml.o pnd_notify.o pnd_locate.o pnd_tinyxml.o pnd_pndfiles.o pnd_apps.o
+ALLOBJ = pnd_conf.o pnd_container.o pnd_discovery.o pnd_pxml.o pnd_notify.o pnd_locate.o pnd_tinyxml.o pnd_pndfiles.o pnd_apps.o pnd_utility.o pnd_desktop.o
 
 all: ${SOLIB} ${LIB} conftest discotest notifytest locatetest pndnotifyd
 
 clean:
        ${RM} -f ${ALLOBJ} ${XMLOBJ} ${LIB} ${SOLIB1} locatetest.o bin/locatetest conftest.o bin/conftest discotest.o bin/discotest bin/notifytest notifytest.o bin/pndnotifyd pndnotifyd.o ${SOLIB} testdata/dotdesktop/*.desktop testdata/apps/*.pnd testdata/dotdesktop/*.png deployment/usr/lib/libpnd* deployment/usr/bin/pndnotifyd deployment/usr/pandora/scripts/* deployment/etc/sudoers deployment/etc/init.d/pndnotifyd
+       ${RM} -rf deployment/media
        find . -name "*~*" -exec rm {} \; -print
 
 # component targets
@@ -60,6 +61,9 @@ deploy:
        mkdir -p deployment/usr/pandora/apps
        mkdir -p deployment/usr/pandora/scripts
        mkdir -p deployment/etc/init.d/
+       # premake the directories that SD's mount onto; makes pndnotifyd life easier
+       mkdir -p deployment/media/mmcblk0p1
+       mkdir -p deployment/media/mmcblk1p1
        # copy in goodies
        cp libpnd* deployment/usr/lib
        cp bin/pndnotifyd deployment/usr/bin