[frogr] Back to compiling flicksoup as a static library and link it from frogr.

[Mario Sanchez Prada <msanchez src gnome org>]

commit b7b668cb303f3cc4b87276b14fc983bdc8a7f8ec
Author: Mario Sanchez Prada <msanchez igalia com>
Date:   Fri Jun 3 23:14:54 2011 +0200

    Back to compiling flicksoup as a static library and link it from frogr.
    
    Also, moved the src/flicksoup/examples/ directory (yes, once again) to
    src/examples, where I think it makes more sense (probably arguable).

 configure.ac                               |    2 +-
 src/Makefile.am                            |   15 ++++-----------
 src/{flicksoup => }/examples/Makefile.am   |   22 ++++++++--------------
 src/{flicksoup => }/examples/example.c     |    6 +++---
 src/{flicksoup => }/examples/testphoto.png |  Bin 9445 -> 9445 bytes
 src/flicksoup/Makefile.am                  |   18 +++++++++++++++++-
 6 files changed, 33 insertions(+), 30 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d7eb4d8..61a3977 100644
--- a/configure.ac
+++ b/configure.ac
@@ -192,7 +192,7 @@ AC_CONFIG_FILES([
         Makefile
         src/Makefile
         src/flicksoup/Makefile
-        src/flicksoup/examples/Makefile
+        src/examples/Makefile
         po/Makefile.in
         help/Makefile
 ])
diff --git a/src/Makefile.am b/src/Makefile.am
index 1139665..42589ed 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,11 +16,13 @@
 MAINTAINERCLEANFILES = \
 	Makefile.in
 
-SUBDIRS = flicksoup
+SUBDIRS = flicksoup examples
 
 bin_PROGRAMS = frogr
 
-frogr_LDADD = $(FROGR_LIBS)
+frogr_LDADD = \
+       flicksoup/libflicksoup.a \
+       $(FROGR_LIBS)
 
 frogr_CFLAGS = $(FROGR_CFLAGS) \
 	-DDATA_DIR=\"$(DATA_DIR)\"
@@ -40,15 +42,6 @@ frogr_LDFLAGS = -export-dynamic
 endif
 
 frogr_SOURCES = \
-	flicksoup/flicksoup.h \
-	flicksoup/fsp-data.c \
-	flicksoup/fsp-data.h \
-	flicksoup/fsp-error.c \
-	flicksoup/fsp-error.h \
-	flicksoup/fsp-parser.c \
-	flicksoup/fsp-parser.h \
-	flicksoup/fsp-session.c \
-	flicksoup/fsp-session.h \
 	frogr-about-dialog.c \
 	frogr-about-dialog.h \
 	frogr-account.c \
diff --git a/src/flicksoup/examples/Makefile.am b/src/examples/Makefile.am
similarity index 53%
rename from src/flicksoup/examples/Makefile.am
rename to src/examples/Makefile.am
index 2eeef90..00ad6bc 100644
--- a/src/flicksoup/examples/Makefile.am
+++ b/src/examples/Makefile.am
@@ -1,13 +1,13 @@
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of version 3 of the GNU Lesser General Public
-# License as published by the Free Software Foundation.
+# it under the terms of version 3 of the GNU General Public License as
+# published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # General Public License for more details.
 #
-# You should have received a copy of the GNU General Public Lesser License
+# You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>
 
 noinst_PROGRAMS = \
@@ -15,18 +15,12 @@ noinst_PROGRAMS = \
 
 example_CFLAGS = \
 	-I$(top_srcdir)/src \
-	$(FROGR_CFLAGS)
+	$(GLIB_CFLAGS)
 
-example_LDADD = $(FROGR_LIBS)
+example_LDADD = \
+	$(top_builddir)/src/flicksoup/libflicksoup.a \
+	$(LIBSOUP_LIBS) \
+	$(LIBXML2_LIBS)
 
 example_SOURCES = \
-	../flicksoup.h \
-	../fsp-data.c \
-	../fsp-data.h \
-	../fsp-error.c \
-	../fsp-error.h \
-	../fsp-parser.c \
-	../fsp-parser.h \
-	../fsp-session.c \
-	../fsp-session.h \
 	example.c
\ No newline at end of file
diff --git a/src/flicksoup/examples/example.c b/src/examples/example.c
similarity index 99%
rename from src/flicksoup/examples/example.c
rename to src/examples/example.c
index 36395bd..f5ff0eb 100644
--- a/src/flicksoup/examples/example.c
+++ b/src/examples/example.c
@@ -5,15 +5,15 @@
  * Authors: Mario Sanchez Prada <msanchez igalia com>
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 3 of the GNU Lesser General
- * Public License as published by the Free Software Foundation.
+ * modify it under the terms of version 3 of the GNU General Public
+ * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Lesser Public License
+ * You should have received a copy of the GNU General Public License
  * along with this program; if not, see <http://www.gnu.org/licenses/>
  *
  */
diff --git a/src/flicksoup/examples/testphoto.png b/src/examples/testphoto.png
similarity index 100%
rename from src/flicksoup/examples/testphoto.png
rename to src/examples/testphoto.png
diff --git a/src/flicksoup/Makefile.am b/src/flicksoup/Makefile.am
index bdfda77..c4da084 100644
--- a/src/flicksoup/Makefile.am
+++ b/src/flicksoup/Makefile.am
@@ -10,4 +10,20 @@
 # You should have received a copy of the GNU General Public Lesser License
 # along with this program; if not, see <http://www.gnu.org/licenses/>
 
-SUBDIRS = examples
+AM_CFLAGS =                      \
+       -I$(top_srcdir)/src       \
+       $(LIBSOUP_CFLAGS)         \
+       $(LIBXML2_CFLAGS)
+
+noinst_LIBRARIES = libflicksoup.a
+
+libflicksoup_a_SOURCES =       \
+       flicksoup.h             \
+       fsp-data.c              \
+       fsp-data.h              \
+       fsp-error.c             \
+       fsp-error.h             \
+       fsp-parser.c            \
+       fsp-parser.h            \
+       fsp-session.c           \
+       fsp-session.h