[SCM] Development fot GoFind! branch, master, updated. 12b3e15fee4df2981a67a12dd1320adc5d554486

[Miriam Ruiz]

The following commit has been merged in the master branch:
commit 12b3e15fee4df2981a67a12dd1320adc5d554486
Author: Miriam Ruiz <miriam at debian.org>
Date:   Thu Apr 30 01:13:31 2009 +0200

    Depend on libxdg-basedir >= 1.0.0
    Temporally link statically with libgofind.a instead of -lgofind

diff --git a/Makefile b/Makefile
index 3dd393f..f41ef48 100644
--- a/Makefile
+++ b/Makefile
@@ -41,14 +41,14 @@ HEADERS=$(shell find . -name "*.h")
 
 PLUGINS= gui_cli.so gui_fltk.so gui_lua.so gui_luagtk.so
 
-all: libgofind.so gofind $(PLUGINS)
+all: libgofind.so libgofind.a gofind $(PLUGINS)
 
 # the main executable has to be linked with the -rdynamic flag
 # so the plug in libraries can call inherited methods and
 # access vtables in the main executable.
 
-gofind: libgofind.so gofind.o
-	g++ -o $@ gofind.o -rdynamic $(LDFLAGS) -L. -lgofind $(LIBS)
+gofind: libgofind.so libgofind.a gofind.o
+	g++ -o $@ gofind.o -rdynamic $(LDFLAGS) -L. libgofind.a $(LIBS)
 
 libgofind.so.$(MAJOR).$(MINOR): $(LIB_OBJS)
 	g++ $(LDFLAGS) -shared \
@@ -83,10 +83,10 @@ gui_luagtk.so : gui_lua.o gui_luagtk.o
 	g++ $(PLUGINS_LDFLAGS) -shared $^ -o $@ `pkg-config lua5.1 --libs` $(LIBS) -llua5.1-gtk
 
 gui_lua.o: gui_lua.cpp
-	g++ -o $@ -c $+ $(CFLAGS) $(PKGCONFIG_CFLAGS) `pkg-config lua5.1 --cflags`
+	g++ -o $@ -c $< $(CFLAGS) $(PKGCONFIG_CFLAGS) `pkg-config lua5.1 --cflags`
 
 gui_luagtk.o: gui_luagtk.cpp
-	g++ -o $@ -c $+ $(CFLAGS) $(PKGCONFIG_CFLAGS) `pkg-config lua5.1 --cflags`
+	g++ -o $@ -c $< $(CFLAGS) $(PKGCONFIG_CFLAGS) `pkg-config lua5.1 --cflags`
 
 %.o: %.cpp $(HEADERS)
 	g++ -o $@ -c $< $(CFLAGS) $(PKGCONFIG_CFLAGS)
@@ -98,10 +98,10 @@ gui_luagtk.o: gui_luagtk.cpp
 	g++ $(LDFLAGS) -shared $^ -o $@
 
 %.static.o: %.cpp $(HEADERS)
-	g++ -o $< -c $+ $(STATIC_CFLAGS) $(PKGCONFIG_CFLAGS)
+	g++ -o $@ -c $< $(STATIC_CFLAGS) $(PKGCONFIG_CFLAGS)
 
 %.static.o: %.c $(HEADERS)
-	gcc -o $< -c $+ $(STATIC_CFLAGS) $(PKGCONFIG_CFLAGS)
+	gcc -o $@ -c $< $(STATIC_CFLAGS) $(PKGCONFIG_CFLAGS)
 
 TEST_OBJS=  filter.test.o taghandler.test.o cfgmanager.test.o boolparser.test.o slre.test.o utf8.test.o CuTest.o dll.test.o test.o
 TEST_PLUGINS= testplugin.test.so
diff --git a/debian/control b/debian/control
index 1afc8bd..1853923 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 5), autotools-dev,
  c++abi2-dev, dh-buildinfo, pkg-config,
  libept-dev (>= 0.5.10), libept-dev (<< 0.6),
  libwibble-dev (>= 0.1.9), libwibble-dev (<< 0.2),
- boolstuff-dev, libxdg-basedir-dev,
+ boolstuff-dev, libxdg-basedir-dev (>= 1.0.0),
  libfltk1.1-dev, fluid, liblua5.1-0-dev
 Standards-Version: 3.8.0
 

-- 
Development fot GoFind!