Commit 382d77f0 authored by Eric L. Hernes's avatar Eric L. Hernes
Browse files

move megawidget.a above the X/g[dt]k libraries so static linking

works

juggle the -L order in libgck, so that the recently built libraries
are found before any previously installed ones.
parent a5375eee
......@@ -14,7 +14,7 @@ SUBDIRS = \
dbbrowser \
fuse \
gflare \
## @GIMPTCL@ \
@GIMPTCL@ \
refract \
script-fu \
struc \
......
......@@ -8,10 +8,10 @@ MapObject_SOURCES = \
amb1.xpm amb2.xpm arcball.c arcball.h diffint1.xpm diffint2.xpm diffref1.xpm diffref2.xpm high1.xpm high2.xpm mapobject_apply.c mapobject_apply.h mapobject_image.c mapobject_image.h mapobject_main.c mapobject_main.h mapobject_pixmaps.h mapobject_preview.c mapobject_preview.h mapobject_shade.c mapobject_shade.h mapobject_ui.c mapobject_ui.h specref1.xpm specref2.xpm
INCLUDES = \
$(X_CFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/plug-ins/libgck \
-I$(includedir)
-I$(includedir) \
$(X_CFLAGS)
LDADD = \
$(top_builddir)/libgimp/libgimpui.la \
......
......@@ -13,11 +13,10 @@ INCLUDES = \
-I$(includedir)
LDADD = \
$(top_srcdir)/plug-ins/megawidget/libmegawidget.a \
$(top_builddir)/libgimp/libgimpui.la \
$(top_builddir)/libgimp/libgimp.la \
$(X_LIBS) \
\
$(top_srcdir)/plug-ins/megawidget/libmegawidget.a \
-lc
DEPS = \
......
......@@ -13,11 +13,10 @@ INCLUDES = \
-I$(includedir)
LDADD = \
$(top_srcdir)/plug-ins/megawidget/libmegawidget.a \
$(top_builddir)/libgimp/libgimpui.la \
$(top_builddir)/libgimp/libgimp.la \
$(X_LIBS) \
\
$(top_srcdir)/plug-ins/megawidget/libmegawidget.a \
-lc
DEPS = \
......
......@@ -13,11 +13,10 @@ INCLUDES = \
-I$(includedir)
LDADD = \
$(top_srcdir)/plug-ins/megawidget/libmegawidget.a \
$(top_builddir)/libgimp/libgimpui.la \
$(top_builddir)/libgimp/libgimp.la \
$(X_LIBS) \
\
$(top_srcdir)/plug-ins/megawidget/libmegawidget.a \
-lc
DEPS = \
......
......@@ -25,9 +25,9 @@ gckinclude_HEADERS = gck.h \
libgck_la_LDFLAGS = -version-info 0:1:0 -rpath $(libdir)
INCLUDES = \
-I$(srcdir)/.. \
-I$(top_srcdir) \
-I$(includedir) \
-I$(srcdir)/..
-I$(includedir)
.PHONY: files
......
......@@ -13,11 +13,10 @@ INCLUDES = \
-I$(includedir)
LDADD = \
$(top_srcdir)/plug-ins/megawidget/libmegawidget.a \
$(top_builddir)/libgimp/libgimpui.la \
$(top_builddir)/libgimp/libgimp.la \
$(X_LIBS) \
\
$(top_srcdir)/plug-ins/megawidget/libmegawidget.a \
-lc
DEPS = \
......
......@@ -13,11 +13,10 @@ INCLUDES = \
-I$(includedir)
LDADD = \
$(top_srcdir)/plug-ins/megawidget/libmegawidget.a \
$(top_builddir)/libgimp/libgimpui.la \
$(top_builddir)/libgimp/libgimp.la \
$(X_LIBS) \
\
$(top_srcdir)/plug-ins/megawidget/libmegawidget.a \
-lc
DEPS = \
......
......@@ -13,11 +13,10 @@ INCLUDES = \
-I$(includedir)
LDADD = \
$(top_srcdir)/plug-ins/megawidget/libmegawidget.a \
$(top_builddir)/libgimp/libgimpui.la \
$(top_builddir)/libgimp/libgimp.la \
$(X_LIBS) \
\
$(top_srcdir)/plug-ins/megawidget/libmegawidget.a \
-lc
DEPS = \
......
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