diff options
| author | Owen Taylor <otaylor@redhat.com> | 2000-07-14 20:08:10 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2000-07-14 20:08:10 +0000 |
| commit | bb268900245f3760ccd65c33d53602ab53fe2752 (patch) | |
| tree | e3e8bf72c4dd9f5cded8fc79266be5950143eec5 /gdk-pixbuf | |
| parent | 9332748007543df54d5d2138aca2edd4742a3bd3 (diff) | |
| download | gtk+-bb268900245f3760ccd65c33d53602ab53fe2752.tar.gz | |
Move gtk-config to gtk-config-2.0 move gtk_.m4 to gtk-2.0.m4
Fri Jul 14 12:22:49 2000 Owen Taylor <otaylor@redhat.com>
* configure.in Makefile.am gtk-config.m4 gtk.m4: Move
gtk-config to gtk-config-2.0 move gtk_.m4 to
gtk-2.0.m4
* Makefile.am gtk/Makefile.am gdk-pixbuf/Makefile.am
gdk/Makefile.am demos/Makefile.am: Change
library names to libgtk-1.3.la, etc, so that we
can distinguish gtk-1.2 and gtk-2.0 on the linkline.
* Makefile.am gtk/Makefile.am gdk-pixbuf/Makefile.am
gdk/Makefile.am gdk/x11/Makfile.am
Move include files into /usr/include/gtk-2.0,
/usr/lib/gtk-2.0/include/
* autogen.sh acconfig.h configure.in gtk/gtkmain.c
gtk/gtkintl.h: Change package for gettext from
gtk+ to gtk20. Put hack in autogen.sh to modify
po/Makefile.in.in after gettextize to make this
possible.
* gtk+.spec: Some updates, not tested.
* gdk-pixbuf/Makefile.am: Move loaders into
$(libdir)/gtk-2.0/$(GTK_VERSION)/loaders.
* gtk/Makefile.am gtk/gtkrc.c: Move RC file locations
$(sysconfdir)/gtk-2.0 ~/.gtkrc-2.0; theme subdir
to THEMENAME/gtk-2.0/. Move engine directory to
$(libdir)/gtk-2.0/$(GTK_VERSION)/engines.
Diffstat (limited to 'gdk-pixbuf')
| -rw-r--r-- | gdk-pixbuf/Makefile.am | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am index 8bb61b676a..79b04626fd 100644 --- a/gdk-pixbuf/Makefile.am +++ b/gdk-pixbuf/Makefile.am @@ -1,9 +1,9 @@ SUBDIRS = pixops lib_LTLIBRARIES = \ - libgdk_pixbuf.la + libgdk_pixbuf-1.3.la -libexecdir = $(libdir)/gdk-pixbuf/loaders +loaderdir = $(libdir)/gtk-2.0/$(GTK_VERSION)/loaders # # The PNG plugin. @@ -94,7 +94,7 @@ BMP_LIB = libpixbufloader-bmp.la if BUILD_DYNAMIC_MODULES -libexec_LTLIBRARIES = \ +loader_LTLIBRARIES = \ $(PNG_LIB) \ $(JPEG_LIB) \ $(GIF_LIB) \ @@ -109,7 +109,7 @@ libexec_LTLIBRARIES = \ extra_sources = else -libexec_LTLIBRARIES = +loader_LTLIBRARIES = extra_sources = $(libpixbufloader_png_la_SOURCES) \ $(libpixbufloader_jpeg_la_SOURCES) \ @@ -127,14 +127,14 @@ endif noinst_PROGRAMS = test-gdk-pixbuf TESTS = test-gdk-pixbuf -DEPS = libgdk_pixbuf.la +DEPS = libgdk_pixbuf-1.3.la INCLUDES = -I$(top_srcdir) -I$(top_builddir) \ -I$(top_srcdir)/gdk-pixbuf \ -I$(top_builddir)/gdk-pixbuf \ $(GLIB_CFLAGS) -AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(libexecdir)\"" +AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" -LDADDS = libgdk_pixbuf.la $(GLIB_LIBS) $(STATIC_LIB_DEPS) +LDADDS = libgdk_pixbuf-1.3.la $(GLIB_LIBS) $(STATIC_LIB_DEPS) test_gdk_pixbuf_LDADD = $(LDADDS) -lgmodule @@ -144,9 +144,9 @@ GDK_PIXBUF_LIBS = $(GLIB_LIBS) # The GdkPixBuf library # -libgdk_pixbufincludedir = $(includedir)/gdk-pixbuf +libgdk_pixbufincludedir = $(includedir)/gtk-2.0/gdk-pixbuf -libgdk_pixbuf_la_SOURCES = \ +libgdk_pixbuf_1_3_la_SOURCES = \ gdk-pixbuf.c \ gdk-pixbuf-animation.c \ gdk-pixbuf-data.c \ @@ -155,11 +155,10 @@ libgdk_pixbuf_la_SOURCES = \ gdk-pixbuf-util.c \ $(extra_sources) -libgdk_pixbuf_la_LDFLAGS = \ +libgdk_pixbuf_1_3_la_LDFLAGS = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -release $(LT_RELEASE) \ $(GLIB_LIBS) -libgdk_pixbuf_la_LIBADD = pixops/libpixops.la +libgdk_pixbuf_1_3_la_LIBADD = pixops/libpixops.la libgdk_pixbufinclude_HEADERS = \ gdk-pixbuf.h \ |