Changeset 2317


Ignore:
Timestamp:
Apr 26, 2008, 10:41:35 AM (12 years ago)
Author:
Sam Hocevar
Message:
  • Preparing a huge PWNtcha reorganisation. First step: put each decoder in its own subdirectory.
Location:
pwntcha/trunk
Files:
28 added
3 edited
14 moved

Legend:

Unmodified
Added
Removed
  • pwntcha/trunk/.gitignore

    r2315 r2317  
    1414.libs
    1515*.la
     16*.a
    1617*.lo
    1718*.o
  • pwntcha/trunk/configure.ac

    r2315 r2317  
    88
    99AC_PREREQ(2.50)
    10 dnlAC_CANONICAL_SYSTEM
     10dnl AC_CANONICAL_SYSTEM
    1111
    1212AC_PROG_CC
    1313AM_PROG_CC_C_O
    1414AC_PROG_CXX
     15AC_PROG_RANLIB
    1516AC_STDC_HEADERS
    1617
     
    8182  Makefile
    8283  src/Makefile
     84  src/authimage/Makefile
     85  src/clubic/Makefile
     86  src/java/Makefile
     87  src/linuxfr/Makefile
     88  src/livejournal/Makefile
     89  src/lmt/Makefile
     90  src/paypal/Makefile
     91  src/phpbb/Makefile
     92  src/scode/Makefile
     93  src/slashdot/Makefile
     94  src/ticketmaster/Makefile
     95  src/tickets/Makefile
     96  src/vbulletin/Makefile
     97  src/xanga/Makefile
    8398  extras/Makefile
    8499  share/Makefile
  • pwntcha/trunk/src/Makefile.am

    r1003 r2317  
    1 NULL =
     1
     2SUBDIRS = authimage clubic java linuxfr livejournal lmt paypal phpbb scode \
     3          slashdot ticketmaster tickets vbulletin xanga
    24
    35bin_PROGRAMS = pwntcha
     
    810    image.c \
    911    common.h \
    10     authimage.c \
    11     clubic.c \
    12     java.c \
    13     linuxfr.c \
    14     livejournal.c \
    15     lmt.c \
    16     paypal.c \
    17     phpbb.c \
    18     scode.c \
    19     slashdot.c \
    20     tickets.c \
    21     ticketmaster.c \
    22     vbulletin.c \
    23     xanga.c \
    2412    easter-eggs.c \
    25     test.c
    26 pwntcha_CFLAGS = $(ADDITIONAL_CFLAGS) -Wall -O6
    27 pwntcha_LDFLAGS = $(ADDITIONAL_LDFLAGS)
    28 pwntcha_LDADD = $(ADDITIONAL_LDADD)
     13    test.c \
     14    $(NULL)
     15pwntcha_CFLAGS = $(imaging_cflags) -Wall -O6
     16pwntcha_LDFLAGS = $(imaging_ldflags)
     17pwntcha_LDADD = $(SUBDIRS:%=%/libdecoder.a)
    2918
    3019if USE_SDL
    31 ADDITIONAL_CFLAGS = `sdl-config --cflags`
    32 ADDITIONAL_LDFLAGS = `sdl-config --libs` -lSDL_image
    33 ADDITIONAL_LDADD =
     20imaging_cflags = `sdl-config --cflags`
     21imaging_ldflags = `sdl-config --libs` -lSDL_image
    3422else
    3523if USE_IMLIB2
    36 ADDITIONAL_CFLAGS = `imlib2-config --cflags` -DX_DISPLAY_MISSING=1
    37 ADDITIONAL_LDFLAGS = `imlib2-config --libs`
    38 ADDITIONAL_LDADD =
     24imaging_cflags = `imlib2-config --cflags` -DX_DISPLAY_MISSING=1
     25imaging_ldflags = `imlib2-config --libs`
    3926else
    4027if USE_OPENCV
    41 ADDITIONAL_CFLAGS = `opencv-config --cflags`
    42 ADDITIONAL_LDFLAGS = `opencv-config --libs opencv highgui`
    43 ADDITIONAL_LDADD =
     28imaging_cflags = `opencv-config --cflags`
     29imaging_ldflags = `opencv-config --libs opencv highgui`
    4430else
    45 ADDITIONAL_CFLAGS =
    46 ADDITIONAL_LDFLAGS =
    47 ADDITIONAL_LDADD =
     31imaging_cflags =
     32imaging_ldflags =
    4833endif
    4934endif
Note: See TracChangeset for help on using the changeset viewer.