X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-libraries.git;a=blobdiff_plain;f=Makefile;h=01c529c027fab75232a9ba44fa44c279bff0b974;hp=741fe3cff71fc79ea91f6cb6cb1a494494964594;hb=5c3c97f377fd3be4ceecf16fba765852d1a9572b;hpb=4bd8308c28a15609eae41931211a5f114ce18c6b

diff --git a/Makefile b/Makefile
index 741fe3c..01c529c 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ ALLOBJ = pnd_conf.o pnd_container.o pnd_discovery.o pnd_pxml.o pnd_notify.o pnd_
 all: ${SOLIB} ${LIB} conftest discotest evdevtest notifytest pndnotifyd rawpxmltest pndvalidator loggertest dbusnotifytest pnd_run pndevmapperd pnd_info evtest mmenu mmwrapper
 
 clean:
-	${RM} -f ${ALLOBJ} ${XMLOBJ} ${LIB} ${SOLIB1} locatetest.o bin/locatetest conftest.o bin/conftest discotest.o evdevtest.o bin/evdevtest bin/discotest dbusnotifytest.o bin/dbusnotifytest loggertest.o bin/loggertest bin/notifytest notifytest.o bin/rawpxmltest rawpxmltest.o bin/pnd_run pnd_run.o pnd_info.o bin/pnd_info bin/pndevmapperd pndevmapperd.o bin/pndnotifyd pndnotifyd.o ${SOLIB} testdata/dotdesktop/*.desktop testdata/menu/*.desktop testdata/apps/*.pnd testdata/dotdesktop/*.png deployment/usr/lib/libpnd* deployment/usr/bin/pndnotifyd deployment/usr/bin/pnd_run deployment/usr/bin/pnd_info deployment/usr/pandora/scripts/* deployment/etc/sudoers deployment/etc/init.d/pndnotifyd bin/pndvalidator pndvalidator.o deployment/usr/bin/pndevmapperd testdata/menuicons/* evtest.o bin/evtest bin/mmenu bin/mmwrapper mmenu.o mmwrapper.o deployment/usr/bin/mmenu deployment/usr/bin/mmwrapper mmcache.o mmui.o mmcat.o
+	${RM} -f ${ALLOBJ} ${XMLOBJ} ${LIB} ${SOLIB1} locatetest.o bin/locatetest conftest.o bin/conftest discotest.o evdevtest.o bin/evdevtest bin/discotest dbusnotifytest.o bin/dbusnotifytest loggertest.o bin/loggertest bin/notifytest notifytest.o bin/rawpxmltest rawpxmltest.o bin/pnd_run pnd_run.o pnd_info.o bin/pnd_info bin/pndevmapperd pndevmapperd.o bin/pndnotifyd pndnotifyd.o ${SOLIB} testdata/dotdesktop/*.desktop testdata/menu/*.desktop testdata/apps/*.ovr testdata/apps/*.pnd testdata/dotdesktop/*.png deployment/usr/lib/libpnd* deployment/usr/bin/pndnotifyd deployment/usr/bin/pnd_run deployment/usr/bin/pnd_info deployment/usr/pandora/scripts/* deployment/etc/sudoers deployment/etc/init.d/pndnotifyd bin/pndvalidator pndvalidator.o deployment/usr/bin/pndevmapperd testdata/menuicons/* evtest.o bin/evtest bin/mmenu bin/mmwrapper mmenu.o mmwrapper.o deployment/usr/bin/mmenu deployment/usr/bin/mmwrapper mmcache.o mmui.o mmcat.o mmconf.o freedsktop_cats.o freedesktop_cats.o mmcustom_cats.o
 	${RM} -rf deployment/media deployment/etc/pandora/mmenu
 	find . -name "*~*" -exec rm {} \; -print
 
@@ -46,24 +46,24 @@ ${SOLIB1}:	${ALLOBJ} ${XMLOBJ}
 	ln -f -s ${SOLIB1} ${SOLIB}
 
 pndnotifyd:	pndnotifyd.o ${SOLIB1}
-	${CC} -lstdc++ -o bin/pndnotifyd pndnotifyd.o ${SOLIB1}
+	${CXX}  -o bin/pndnotifyd pndnotifyd.o ${SOLIB1}
 
 pndvalidator:	pndvalidator.o ${SOLIB1}
-	${CC} -lstdc++ -o bin/pndvalidator pndvalidator.o ${SOLIB1}
+	${CXX} -o bin/pndvalidator pndvalidator.o ${SOLIB1}
 
 pnd_run:	pnd_run.o ${SOLIB1}
-	${CC} -lstdc++ -o bin/pnd_run pnd_run.o ${SOLIB1}
+	${CXX} -o bin/pnd_run pnd_run.o ${SOLIB1}
 
 pnd_info:	pnd_info.o ${SOLIB1}
-	${CC} -lstdc++ -o bin/pnd_info pnd_info.o ${SOLIB1}
+	${CXX} -o bin/pnd_info pnd_info.o ${SOLIB1}
 
 pndevmapperd:	pndevmapperd.o ${SOLIB1}
-	${CC} -lstdc++ -o bin/pndevmapperd pndevmapperd.o ${SOLIB1}
+	${CXX} -o bin/pndevmapperd pndevmapperd.o ${SOLIB1}
 
-mmenu:	mmenu.o mmui.o mmcache.o mmcat.o ${SOLIB1}
-	${CC} -lstdc++ -o bin/mmenu mmenu.o mmui.o mmcache.o mmcat.o ${SOLIB1} -L${PNDSTUFF}/usr/lib -lSDL -lSDL_image -lSDL_ttf -lSDL_gfx
+mmenu:	mmenu.o mmui.o mmcache.o mmcat.o mmconf.o freedesktop_cats.o mmcustom_cats.o ${SOLIB1}
+	${CXX} -o bin/mmenu mmenu.o mmui.o mmcache.o mmcat.o mmconf.o freedesktop_cats.o mmcustom_cats.o ${SOLIB1} -L${PNDSTUFF}/usr/lib -lSDL -lSDL_image -lSDL_ttf -lSDL_gfx
 mmwrapper:	mmwrapper.o ${SOLIB1}
-	${CC} -lstdc++ -o bin/mmwrapper mmwrapper.o ${SOLIB1}
+	${CXX} -o bin/mmwrapper mmwrapper.o ${SOLIB1}
 
 # deployment and assembly components
 #
@@ -80,6 +80,7 @@ deploy:
 	mkdir -p deployment/etc/pandora/conf
 	mkdir -p deployment/etc/pandora/mmenu/skins/default
 	mkdir -p deployment/etc/pandora/mmenu/skins/perty
+	mkdir -p deployment/etc/pandora/mmenu/skins/clean
 	mkdir -p deployment/usr/lib
 	mkdir -p deployment/usr/bin
 	mkdir -p deployment/usr/pandora/apps
@@ -106,33 +107,34 @@ deploy:
 	cp bin/mmwrapper deployment/usr/bin
 	cp minimenu/skin/default/* deployment/etc/pandora/mmenu/skins/default
 	cp minimenu/skin/perty/* deployment/etc/pandora/mmenu/skins/perty
+	cp minimenu/skin/clean/* deployment/etc/pandora/mmenu/skins/clean
 
 # test tool targets
 #
 
 conftest:	conftest.o ${LIB}
-	${CC} -lstdc++ -o bin/conftest conftest.o libpnd.a
+	${CXX} -o bin/conftest conftest.o libpnd.a
 
 discotest:	discotest.o ${LIB}
-	${CC} -lstdc++ -o bin/discotest discotest.o libpnd.a
+	${CXX} -o bin/discotest discotest.o libpnd.a
 
 evdevtest:	evdevtest.o ${LIB}
-	${CC} -lstdc++ -o bin/evdevtest evdevtest.o -static libpnd.a
+	${CXX} -o bin/evdevtest evdevtest.o -static libpnd.a
 
 notifytest:	notifytest.o ${LIB}
-	${CC} -lstdc++ -o bin/notifytest notifytest.o libpnd.a
+	${CXX} -o bin/notifytest notifytest.o libpnd.a
 
 locatetest:	locatetest.o ${SOLIB1}
-	${CC} -lstdc++ -o bin/locatetest locatetest.o ${SOLIB1}
+	${CXX} -o bin/locatetest locatetest.o ${SOLIB1}
 
 rawpxmltest:    rawpxmltest.o ${LIB}
-	${CC} -lstdc++ -o bin/rawpxmltest rawpxmltest.o ${LIB}
+	${CXX} -o bin/rawpxmltest rawpxmltest.o ${LIB}
 
 loggertest:	loggertest.o ${LIB}
-	${CC} -lstdc++ -o bin/loggertest loggertest.o libpnd.a
+	${CXX} -o bin/loggertest loggertest.o libpnd.a
 
 dbusnotifytest:	dbusnotifytest.o ${LIB}
-	${CC} -lstdc++ -o bin/dbusnotifytest dbusnotifytest.o libpnd.a
+	${CXX} -o bin/dbusnotifytest dbusnotifytest.o libpnd.a
 
 evtest:	evtest.o
 	${CC} -o bin/evtest evtest.o