* Preparing a huge PWNtcha reorganisation. First step: put each decoder in

its own subdirectory.


git-svn-id: file:///srv/caca.zoy.org/var/lib/svn/pwntcha/trunk@2317 92316355-f0b4-4df1-b90c-862c8a59935f

.gitignore

@@ -13,6 +13,7 @@ stamp-h1
 .deps
 .libs
 *.la
+*.a
 *.lo
 *.o
 src/pwntcha

configure.ac

@@ -7,11 +7,12 @@ AM_INIT_AUTOMAKE([no-define tar-ustar])
 AM_CONFIG_HEADER(config.h)
 
 AC_PREREQ(2.50)
-dnlAC_CANONICAL_SYSTEM
+dnl AC_CANONICAL_SYSTEM
 
 AC_PROG_CC
 AM_PROG_CC_C_O
 AC_PROG_CXX
+AC_PROG_RANLIB
 AC_STDC_HEADERS
 
 AC_C_CONST
@@ -80,6 +81,20 @@ fi
 AC_OUTPUT([
   Makefile
   src/Makefile
+  src/authimage/Makefile
+  src/clubic/Makefile
+  src/java/Makefile
+  src/linuxfr/Makefile
+  src/livejournal/Makefile
+  src/lmt/Makefile
+  src/paypal/Makefile
+  src/phpbb/Makefile
+  src/scode/Makefile
+  src/slashdot/Makefile
+  src/ticketmaster/Makefile
+  src/tickets/Makefile
+  src/vbulletin/Makefile
+  src/xanga/Makefile
   extras/Makefile
   share/Makefile
 ])

src/Makefile.am

@@ -1,4 +1,6 @@
-NULL = 
+
+SUBDIRS = authimage clubic java linuxfr livejournal lmt paypal phpbb scode \
+          slashdot ticketmaster tickets vbulletin xanga
 
 bin_PROGRAMS = pwntcha
 pwntcha_SOURCES = \
@@ -7,44 +9,27 @@ pwntcha_SOURCES = \
     font.c \
     image.c \
     common.h \
-    authimage.c \
-    clubic.c \
-    java.c \
-    linuxfr.c \
-    livejournal.c \
-    lmt.c \
-    paypal.c \
-    phpbb.c \
-    scode.c \
-    slashdot.c \
-    tickets.c \
-    ticketmaster.c \
-    vbulletin.c \
-    xanga.c \
     easter-eggs.c \
-    test.c
-pwntcha_CFLAGS = $(ADDITIONAL_CFLAGS) -Wall -O6
-pwntcha_LDFLAGS = $(ADDITIONAL_LDFLAGS)
-pwntcha_LDADD = $(ADDITIONAL_LDADD)
+    test.c \
+    $(NULL)
+pwntcha_CFLAGS = $(imaging_cflags) -Wall -O6
+pwntcha_LDFLAGS = $(imaging_ldflags)
+pwntcha_LDADD = $(SUBDIRS:%=%/libdecoder.a)
 
 if USE_SDL
-ADDITIONAL_CFLAGS = `sdl-config --cflags`
-ADDITIONAL_LDFLAGS = `sdl-config --libs` -lSDL_image
-ADDITIONAL_LDADD =
+imaging_cflags = `sdl-config --cflags`
+imaging_ldflags = `sdl-config --libs` -lSDL_image
 else
 if USE_IMLIB2
-ADDITIONAL_CFLAGS = `imlib2-config --cflags` -DX_DISPLAY_MISSING=1
-ADDITIONAL_LDFLAGS = `imlib2-config --libs`
-ADDITIONAL_LDADD =
+imaging_cflags = `imlib2-config --cflags` -DX_DISPLAY_MISSING=1
+imaging_ldflags = `imlib2-config --libs`
 else
 if USE_OPENCV
-ADDITIONAL_CFLAGS = `opencv-config --cflags`
-ADDITIONAL_LDFLAGS = `opencv-config --libs opencv highgui`
-ADDITIONAL_LDADD =
+imaging_cflags = `opencv-config --cflags`
+imaging_ldflags = `opencv-config --libs opencv highgui`
 else
-ADDITIONAL_CFLAGS =
-ADDITIONAL_LDFLAGS =
-ADDITIONAL_LDADD =
+imaging_cflags =
+imaging_ldflags =
 endif
 endif
 endif

src/authimage/Makefile.am

@@ -0,0 +1,6 @@
+
+noinst_LIBRARIES = libdecoder.a
+
+libdecoder_a_SOURCES = decoder.c
+libdecoder_a_CPPFLAGS = -I$(srcdir)/..
+

src/clubic/Makefile.am

@@ -0,0 +1,6 @@
+
+noinst_LIBRARIES = libdecoder.a
+
+libdecoder_a_SOURCES = decoder.c
+libdecoder_a_CPPFLAGS = -I$(srcdir)/..
+

src/java/Makefile.am

@@ -0,0 +1,6 @@
+
+noinst_LIBRARIES = libdecoder.a
+
+libdecoder_a_SOURCES = decoder.c
+libdecoder_a_CPPFLAGS = -I$(srcdir)/..
+

src/linuxfr/Makefile.am

@@ -0,0 +1,6 @@
+
+noinst_LIBRARIES = libdecoder.a
+
+libdecoder_a_SOURCES = decoder.c
+libdecoder_a_CPPFLAGS = -I$(srcdir)/..
+

src/livejournal/Makefile.am

@@ -0,0 +1,6 @@
+
+noinst_LIBRARIES = libdecoder.a
+
+libdecoder_a_SOURCES = decoder.c
+libdecoder_a_CPPFLAGS = -I$(srcdir)/..
+

src/lmt/Makefile.am

@@ -0,0 +1,6 @@
+
+noinst_LIBRARIES = libdecoder.a
+
+libdecoder_a_SOURCES = decoder.c
+libdecoder_a_CPPFLAGS = -I$(srcdir)/..
+

src/paypal/Makefile.am

@@ -0,0 +1,6 @@
+
+noinst_LIBRARIES = libdecoder.a
+
+libdecoder_a_SOURCES = decoder.c
+libdecoder_a_CPPFLAGS = -I$(srcdir)/..
+

src/phpbb/Makefile.am

@@ -0,0 +1,6 @@
+
+noinst_LIBRARIES = libdecoder.a
+
+libdecoder_a_SOURCES = decoder.c
+libdecoder_a_CPPFLAGS = -I$(srcdir)/..
+

src/scode/Makefile.am

@@ -0,0 +1,6 @@
+
+noinst_LIBRARIES = libdecoder.a
+
+libdecoder_a_SOURCES = decoder.c
+libdecoder_a_CPPFLAGS = -I$(srcdir)/..
+

src/slashdot/Makefile.am

@@ -0,0 +1,6 @@
+
+noinst_LIBRARIES = libdecoder.a
+
+libdecoder_a_SOURCES = decoder.c
+libdecoder_a_CPPFLAGS = -I$(srcdir)/..
+

src/ticketmaster/Makefile.am

@@ -0,0 +1,6 @@
+
+noinst_LIBRARIES = libdecoder.a
+
+libdecoder_a_SOURCES = decoder.c
+libdecoder_a_CPPFLAGS = -I$(srcdir)/..
+

src/tickets/Makefile.am

@@ -0,0 +1,6 @@
+
+noinst_LIBRARIES = libdecoder.a
+
+libdecoder_a_SOURCES = decoder.c
+libdecoder_a_CPPFLAGS = -I$(srcdir)/..
+

src/vbulletin/Makefile.am

@@ -0,0 +1,6 @@
+
+noinst_LIBRARIES = libdecoder.a
+
+libdecoder_a_SOURCES = decoder.c
+libdecoder_a_CPPFLAGS = -I$(srcdir)/..
+

src/xanga/Makefile.am

@@ -0,0 +1,6 @@
+
+noinst_LIBRARIES = libdecoder.a
+
+libdecoder_a_SOURCES = decoder.c
+libdecoder_a_CPPFLAGS = -I$(srcdir)/..
+