X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-libraries.git;a=blobdiff_plain;f=Makefile;h=d080a1fabf630a41f0a18b7ebaa40ade723ec8b2;hp=93b567a6e1eaef02d594f1344c5746b19a76d86f;hb=HEAD;hpb=2674535f2806b92169ce862bccd95206fff140e3

diff --git a/Makefile b/Makefile
index 93b567a..d080a1f 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,8 @@ RM = rm
 # environment
 VPATH = lib test apps minimenu
 CFLAG_SO = -fPIC #-fPIC not always needed, but good to have
-CFLAGS = -Wall -I./include -g ${CFLAG_SO} -I/usr/include/SDL
+CFLAG_SO += -D_FILE_OFFSET_BITS=64
+CFLAGS = -Wall -I./include -g ${CFLAG_SO} -I${PNDSTUFF}/usr/include/SDL
 CXXFLAGS = -Wall -I./include -g ${CFLAG_SO}
 
 # code
@@ -21,13 +22,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 pnd_utility.o pnd_desktop.o pnd_io_gpio.o pnd_logger.o pnd_dbusnotify.o pnd_device.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 pnd_io_gpio.o pnd_io_ioctl.o pnd_io_evdev.o pnd_logger.o pnd_dbusnotify.o pnd_device.o
 
-all: ${SOLIB} ${LIB} conftest discotest notifytest pndnotifyd rawpxmltest pndvalidator loggertest dbusnotifytest pnd_run pndevmapperd pnd_info evtest mmenu mmwrapper
+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 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} -rf deployment/media
+	${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
 
 # component targets
@@ -37,33 +38,31 @@ libpnd.a:	${ALLOBJ} ${XMLOBJ}
 	${AR} r ${LIB} ${ALLOBJ} ${XMLOBJ}
 	${RANLIB} ${LIB}
 
-libpnd.so.1:	${ALLOBJ} ${XMLOBJ}
-	${CC} -shared -Wl,-soname,${SOLIB} -o ${SOLIB1} ${ALLOBJ} ${XMLOBJ}
+${SOLIB}:	${SOLIB1}
 	ln -f -s ${SOLIB1} ${SOLIB}
 
 ${SOLIB1}:	${ALLOBJ} ${XMLOBJ}
-	${CC} -shared -Wl,-soname,${SOLIB} -o ${SOLIB1} ${ALLOBJ} ${XMLOBJ}
-	ln -f -s ${SOLIB1} ${SOLIB}
+	${CXX} -shared -Wl,-soname,${SOLIB} -o ${SOLIB1} ${ALLOBJ} ${XMLOBJ}
 
 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} -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
 #
@@ -78,6 +77,9 @@ deploy:
 	# populate deployment directory for copying into image bakes
 	# make dirs
 	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
@@ -100,32 +102,38 @@ deploy:
 	cp testdata/sh/pndnotifyd deployment/etc/init.d/pndnotifyd
 	cp testdata/sh/sudoers deployment/etc/sudoers
 	# minimenu
-	cp bin/mmenu /deployment/usr/bin
-	cp bin/mmwrapper /deployment/usr/bin
+	cp bin/mmenu deployment/usr/bin
+	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}
+	${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