X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-libraries.git;a=blobdiff_plain;f=Makefile;h=b445b4c417b8dacef4af0bf01f47f401926f5851;hp=887fa3f3f0735452f7e6f182ddb76afe04cb50ca;hb=471022009f9f9ce5d41a5034aaeb48c4264c3e20;hpb=51f7f6de18d222ac36d8e6f8f01b5a1c0203e85f diff --git a/Makefile b/Makefile index 887fa3f..b445b4c 100644 --- a/Makefile +++ b/Makefile @@ -11,9 +11,9 @@ RANLIB = ${CROSSCOMPILE}ranlib RM = rm # environment -VPATH = lib test apps +VPATH = lib test apps minimenu CFLAG_SO = -fPIC #-fPIC not always needed, but good to have -CFLAGS = -Wall -I./include -g ${CFLAG_SO} +CFLAGS = -Wall -I./include -g ${CFLAG_SO} -I${PNDSTUFF}/usr/include/SDL CXXFLAGS = -Wall -I./include -g ${CFLAG_SO} # code @@ -21,13 +21,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 +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 +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/* - ${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 @@ -60,6 +60,11 @@ pnd_info: pnd_info.o ${SOLIB1} pndevmapperd: pndevmapperd.o ${SOLIB1} ${CC} -lstdc++ -o bin/pndevmapperd pndevmapperd.o ${SOLIB1} +mmenu: mmenu.o mmui.o mmcache.o mmcat.o mmconf.o freedesktop_cats.o mmcustom_cats.o ${SOLIB1} + ${CC} -lstdc++ -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} + # deployment and assembly components # @@ -73,6 +78,8 @@ 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/usr/lib mkdir -p deployment/usr/bin mkdir -p deployment/usr/pandora/apps @@ -88,10 +95,17 @@ deploy: cp bin/pnd_info deployment/usr/bin cp testdata/scripts/* deployment/usr/pandora/scripts cp bin/pndevmapperd deployment/usr/bin + cp bin/mmenu deployment/usr/bin + cp bin/mmwrapper deployment/usr/bin # copy in freebee .pnd apps to /usr/pandora/apps # add pndnotify to etc/rc/startup-whatever 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 minimenu/skin/default/* deployment/etc/pandora/mmenu/skins/default + cp minimenu/skin/perty/* deployment/etc/pandora/mmenu/skins/perty # test tool targets # @@ -102,6 +116,9 @@ conftest: conftest.o ${LIB} discotest: discotest.o ${LIB} ${CC} -lstdc++ -o bin/discotest discotest.o libpnd.a +evdevtest: evdevtest.o ${LIB} + ${CC} -lstdc++ -o bin/evdevtest evdevtest.o -static libpnd.a + notifytest: notifytest.o ${LIB} ${CC} -lstdc++ -o bin/notifytest notifytest.o libpnd.a @@ -116,3 +133,6 @@ loggertest: loggertest.o ${LIB} dbusnotifytest: dbusnotifytest.o ${LIB} ${CC} -lstdc++ -o bin/dbusnotifytest dbusnotifytest.o libpnd.a + +evtest: evtest.o + ${CC} -o bin/evtest evtest.o