callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modules/other/gail/libgail-util/Makefile.am Link with gtktargetlib and

Browse Source 
2008-01-10  Tor Lillqvist  <tml@novell.com>

	* modules/other/gail/libgail-util/Makefile.am
	* modules/other/gail/tests/Makefile.am: Link with gtktargetlib and
	gdktargetlib.


svn path=/trunk/; revision=19348
This commit is contained in:
Tor Lillqvist
2008-01-10 21:47:58 +00:00
committed by Tor Lillqvist
parent 01369cf343
commit a39f6c4611
3 changed files with 52 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2008-01-10 Tor Lillqvist <tml@novell.com>
* modules/other/gail/libgail-util/Makefile.am
* modules/other/gail/tests/Makefile.am: Link with gtktargetlib and
gdktargetlib.
2008-01-10 Tor Lillqvist <tml@novell.com> 2008-01-10 Tor Lillqvist <tml@novell.com>
* tests/Makefile.am: Build defaultvaluetest only on Unix as it * tests/Makefile.am: Build defaultvaluetest only on Unix as it

2
modules/other/gail/libgail-util/Makefile.am
View File

@ -59,6 +59,8 @@ libgailutil_la_CFLAGS = \
$(AM_CFLAGS) $(AM_CFLAGS)
libgailutil_la_LIBADD = \ libgailutil_la_LIBADD = \
$(top_builddir)/gtk/$(gtktargetlib) \
$(top_builddir)/gdk/$(gdktargetlib) \
$(GTK_DEP_LIBS) $(GTK_DEP_LIBS)
libgailutil_la_LDFLAGS = \ libgailutil_la_LDFLAGS = \

51
modules/other/gail/tests/Makefile.am
View File

@ -5,8 +5,9 @@ if OS_WIN32
no_undefined = -no-undefined no_undefined = -no-undefined
endif endif
if !OS_WIN32
moduledir = $(libdir)/gtk-2.0/modules moduledir = $(libdir)/gtk-2.0/modules
if !OS_WIN32
module_LTLIBRARIES = \ module_LTLIBRARIES = \
libferret.la libferret.la
endif endif
@ -61,6 +62,8 @@ libtestaction_la_SOURCES = \
libtestaction_la_LDFLAGS = \ libtestaction_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
$(top_builddir)/gdk/$(gdktargetlib) \
$(GTK_DEP_LIBS) \ $(GTK_DEP_LIBS) \
$(LDFLAGS) $(LDFLAGS)
@ -71,8 +74,10 @@ libtestbutton_la_SOURCES = \
libtestbutton_la_LDFLAGS = \ libtestbutton_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
$(top_builddir)/gdk/$(gdktargetlib) \
$(GTK_DEP_LIBS) \ $(GTK_DEP_LIBS) \
$(LDFLAGS) $(LDFLAGS)
libtestcombo_la_SOURCES = \ libtestcombo_la_SOURCES = \
testlib.c \ testlib.c \
@ -81,24 +86,30 @@ libtestcombo_la_SOURCES = \
libtestcombo_la_LDFLAGS = \ libtestcombo_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
$(top_builddir)/gdk/$(gdktargetlib) \
$(GTK_DEP_LIBS) \ $(GTK_DEP_LIBS) \
$(LDFLAGS) $(LDFLAGS)
libtestcomponent_la_SOURCES = \ libtestcomponent_la_SOURCES = \
testcomponent.c testcomponent.c
libtestcomponent_la_LDFLAGS = \ libtestcomponent_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
$(top_builddir)/gdk/$(gdktargetlib) \
$(GTK_DEP_LIBS) \ $(GTK_DEP_LIBS) \
$(LDFLAGS) $(LDFLAGS)
libtestimage_la_SOURCES = \ libtestimage_la_SOURCES = \
testimage.c testimage.c
libtestimage_la_LDFLAGS = \ libtestimage_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
$(top_builddir)/gdk/$(gdktargetlib) \
$(GTK_DEP_LIBS) \ $(GTK_DEP_LIBS) \
$(LDFLAGS) $(LDFLAGS)
libtestmenuitem_la_SOURCES = \ libtestmenuitem_la_SOURCES = \
testlib.c \ testlib.c \
@ -107,8 +118,10 @@ libtestmenuitem_la_SOURCES = \
libtestmenuitem_la_LDFLAGS = \ libtestmenuitem_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
$(top_builddir)/gdk/$(gdktargetlib) \
$(GTK_DEP_LIBS) \ $(GTK_DEP_LIBS) \
$(LDFLAGS) $(LDFLAGS)
libtestnotebook_la_SOURCES = \ libtestnotebook_la_SOURCES = \
testlib.c \ testlib.c \
@ -117,8 +130,10 @@ libtestnotebook_la_SOURCES = \
libtestnotebook_la_LDFLAGS = \ libtestnotebook_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
$(top_builddir)/gdk/$(gdktargetlib) \
$(GTK_DEP_LIBS) \ $(GTK_DEP_LIBS) \
$(LDFLAGS) $(LDFLAGS)
libtestobject_la_SOURCES = \ libtestobject_la_SOURCES = \
testlib.c \ testlib.c \
@ -127,6 +142,8 @@ libtestobject_la_SOURCES = \
libtestobject_la_LDFLAGS = \ libtestobject_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
$(top_builddir)/gdk/$(gdktargetlib) \
$(GTK_DEP_LIBS) \ $(GTK_DEP_LIBS) \
$(LDFLAGS) $(LDFLAGS)
@ -137,6 +154,8 @@ libtestoptionmenu_la_SOURCES = \
libtestoptionmenu_la_LDFLAGS = \ libtestoptionmenu_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
$(top_builddir)/gdk/$(gdktargetlib) \
$(GTK_DEP_LIBS) \ $(GTK_DEP_LIBS) \
$(LDFLAGS) $(LDFLAGS)
@ -147,6 +166,8 @@ libtestpaned_la_SOURCES = \
libtestpaned_la_LDFLAGS = \ libtestpaned_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
$(top_builddir)/gdk/$(gdktargetlib) \
$(GTK_DEP_LIBS) \ $(GTK_DEP_LIBS) \
$(LDFLAGS) $(LDFLAGS)
@ -157,6 +178,8 @@ libtestprops_la_SOURCES = \
libtestprops_la_LDFLAGS = \ libtestprops_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
$(top_builddir)/gdk/$(gdktargetlib) \
$(GTK_DEP_LIBS) \ $(GTK_DEP_LIBS) \
$(LDFLAGS) $(LDFLAGS)
@ -165,6 +188,8 @@ libtestselection_la_SOURCES = \
libtestselection_la_LDFLAGS = \ libtestselection_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
$(top_builddir)/gdk/$(gdktargetlib) \
$(GTK_DEP_LIBS) \ $(GTK_DEP_LIBS) \
$(LDFLAGS) $(LDFLAGS)
@ -173,6 +198,8 @@ libteststatusbar_la_SOURCES = \
libteststatusbar_la_LDFLAGS = \ libteststatusbar_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
$(top_builddir)/gdk/$(gdktargetlib) \
$(GTK_DEP_LIBS) \ $(GTK_DEP_LIBS) \
$(LDFLAGS) $(LDFLAGS)
@ -185,6 +212,8 @@ libtesttable_la_SOURCES = \
libtesttable_la_LDFLAGS = \ libtesttable_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
$(top_builddir)/gdk/$(gdktargetlib) \
$(GTK_DEP_LIBS) \ $(GTK_DEP_LIBS) \
$(LDFLAGS) $(LDFLAGS)
@ -197,6 +226,8 @@ libtesttext_la_SOURCES = \
libtesttext_la_LDFLAGS = \ libtesttext_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
$(top_builddir)/gdk/$(gdktargetlib) \
$(GTK_DEP_LIBS) \ $(GTK_DEP_LIBS) \
$(LDFLAGS) $(LDFLAGS)
@ -207,6 +238,8 @@ libtesttoplevel_la_SOURCES = \
libtesttoplevel_la_LDFLAGS = \ libtesttoplevel_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
$(top_builddir)/gdk/$(gdktargetlib) \
$(GTK_DEP_LIBS) \ $(GTK_DEP_LIBS) \
$(LDFLAGS) $(LDFLAGS)
@ -217,6 +250,8 @@ libtesttreetable_la_SOURCES = \
libtesttreetable_la_LDFLAGS = \ libtesttreetable_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
$(top_builddir)/gdk/$(gdktargetlib) \
$(GTK_DEP_LIBS) \ $(GTK_DEP_LIBS) \
$(LDFLAGS) $(LDFLAGS)
@ -225,5 +260,7 @@ libtestvalues_la_SOURCES = \
libtestvalues_la_LDFLAGS = \ libtestvalues_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
$(top_builddir)/gdk/$(gdktargetlib) \
$(GTK_DEP_LIBS) \ $(GTK_DEP_LIBS) \
$(LDFLAGS) $(LDFLAGS)