recipes/pandora-system/pandora-pmenu/remove-libconfig-from-makefile.patch

   1 Index: git/Makefile
   2 ===================================================================
   3 --- git.orig/Makefile   2009-12-07 10:01:27.091137735 +0000
   4 +++ git/Makefile        2009-12-07 10:02:52.995649783 +0000
   5 @@ -11,18 +11,18 @@
   6  RM = rm
   7
   8  # environment
   9 -LDFLAGS = -L$(PNDSDK)/usr/lib -lSDL -lSDL_image -lSDL_ttf -lfreetype -lGLES2D \
  10 +EXTRALDFLAGS = -L$(PNDSDK)/usr/lib -lSDL -lSDL_image -lSDL_ttf -lfreetype -lGLES2D -lconfig \
  11                 -lGLES_CM -lIMGegl -lsrv_um -lXau -lXdmcp -lXi -lXext -lX11 \
  12                 -lpnd -lstdc++
  13
  14 -CFLAGS = -Wall -Werror -g -Ilibconfig -Ilibpnd -I$(PNDSDK)/usr/include
  15 +CFLAGS += -Wall -Werror -g -I$(PNDSDK)/usr/include
  16  CFLAGS += -O3 -march=armv7-a -mcpu=cortex-a8 -mtune=cortex-a8 -mfloat-abi=softfp \
  17                 -mfpu=neon -ftree-vectorize -ffast-math -fomit-frame-pointer \
  18                 -fno-strict-aliasing -fsingle-precision-constant
  19
  20  # code
  21  TARGET = pmenu
  22 -LIBCONFIG = libconfig/.libs/libconfig.a
  23 +
  24  ALLOBJ = category_media.o category_settings.o config_favourite.o \
  25         config_pmenu.o config_skin.o get_apps.o main.o utils.o \
  26         utils_cpu.o utils_mplayer.o
  27 @@ -38,21 +38,13 @@
  28         cd libconfig; make distclean; cd ..;
  29         find . -name "*~*" -exec rm {} \; -print
  30
  31 -
  32  # component targets
  33  #
  34
  35 -pmenu: ${LIBCONFIG} ${ALLOBJ}
  36 -       ${CC} ${ALLOBJ} ${LIBCONFIG} ${LDFLAGS} -o ${TARGET}
  37 +pmenu: ${ALLOBJ}
  38 +       ${CC} ${ALLOBJ} ${EXTRALDFLAGS} -o ${TARGET}
  39         ${STRIP} ${TARGET}
  40
  41 -libconfig/.libs/libconfig.a:
  42 -       cd libconfig; make distclean; \
  43 -       LDFLAGS="-L$PNDSDK/usr/lib" CFLAGS="-I$PNDSDK/usr/include" \
  44 -               ./configure --host=arm-none-linux-gnueabi --target=arm-none-linux-gnueabi; \
  45 -       make libconfig.la; \
  46 -       cd ..;
  47 -
  48  # deployment and assembly components
  49  #
  50