Commit b7b668cb authored by Mario Sanchez Prada's avatar Mario Sanchez Prada
Browse files

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).
parent 56616a73
......@@ -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
])
......
......@@ -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 \
......
# 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
......@@ -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/>
*
*/
......
......@@ -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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment