Commit db28c2a3 authored by Manish Singh's avatar Manish Singh

libgimp versioning stuff

-Yosh
parent 77b19d2d
Fri Jun 19 12:34:29 PDT 1998 Manish Singh <yosh@gimp.org>
* changes libgimp versioning to gtk-style. Bunch o' Makefile.am
changes for that
Thu Jun 18 23:11:36 1998 Owen Taylor <otaylor@gtk.org>
* app/ink.c: Shift the range to smaller brushes.
......
......@@ -300,13 +300,14 @@ CPPFLAGS = \
-DGIMPDIR=\""$(gimpdir)"\"
INCLUDES = \
$(X_CFLAGS) \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
-I$(includedir)
gimp_LDADD = \
LDADD = \
$(top_builddir)/libgimp/libgimpi.a \
$(X_LIBS)
$(GTK_LIBS) \
-lc
DEPS = \
$(top_builddir)/libgimp/libgimpi.a
......
......@@ -2,17 +2,23 @@ dnl Process this file with autoconf to produce a configure script.
AC_INIT(gimprc.in)
dnl Initialize automake stuff
dnl $Format: "GIMP_MAJOR_VERSION=$ReleaseMajorVersion$" $
GIMP_MAJOR_VERSION=1
dnl $Format: "GIMP_MINOR_VERSION=$ReleaseMinorVersion$" $
GIMP_MINOR_VERSION=1
dnl $Format: "GIMP_MICRO_VERSION=$ReleaseMicroVersion$" $
GIMP_MICRO_VERSION=0
GIMP_INTERFACE_AGE=0
GIMP_BINARY_AGE=0
GIMP_VERSION=$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION.$GIMP_MICRO_VERSION
dnl $Format: "AM_INIT_AUTOMAKE(gimp, $ReleaseVersion$)" $
AM_INIT_AUTOMAKE(gimp, $GIMP_VERSION)
dnl libtool versioning
LT_RELEASE=$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
LT_CURRENT=`expr $GIMP_MICRO_VERSION - $GIMP_INTERFACE_AGE`
LT_REVISION=$GIMP_INTERFACE_AGE
LT_AGE=`expr $GIMP_BINARY_AGE - $GIMP_INTERFACE_AGE`
VERSION=$GIMP_VERSION
PACKAGE=gimp
AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
dnl Specify a header configuration file
AM_CONFIG_HEADER(config.h)
......@@ -32,7 +38,6 @@ fi)
AC_ARG_ENABLE(ansi, [ --enable-ansi turn on strict ansi [default=no]],
, enable_ansi=no)
AC_ARG_WITH(threads, [ --with-threads=[posix] support threading ])
dnl Possibly change default gimpdir from .gimp
gimpdir=.gimp-1.1
......@@ -43,16 +48,6 @@ if eval "test x$enable_gimpdir != x"; then
fi
fi)
AC_DEFUN(AC_GIMP_CHECK,
[
AM_PATH_GTK(1.1.0,,
AC_MSG_ERROR(Test for GTK failed. See the file 'INSTALL' for help.))
X_LIBS=$GTK_LIBS
X_CFLAGS=$GTK_CFLAGS
AC_SUBST(X_LIBS)
AC_SUBST(X_CFLAGS)
])
if test -n "$DEBUGFLAG"; then
CFLAGS="$DEBUGFLAG $CFLAGS"
fi
......@@ -64,7 +59,12 @@ AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
AC_PROG_CPP
AC_GIMP_CHECK
dnl Check for our required libraries
AM_PATH_GLIB(1.1.0,,
AC_MSG_ERROR(Test for GLIB failed. See the file 'INSTALL' for help.))
AM_PATH_GTK(1.1.0,,
AC_MSG_ERROR(Test for GTK failed. See the file 'INSTALL' for help.))
if eval "test x$GCC = xyes"; then
if echo "$CFLAGS" | grep "\-Wall" > /dev/null 2> /dev/null; then
......@@ -93,6 +93,7 @@ gimp_save_LDFLAGS="$LDFLAGS"
gimp_save_LIBS="$LIBS"
CPPFLAGS="$CPPFLAGS $GTK_CFLAGS"
LDFLAGS="$LDFLAGS `echo $GLIB_LIBS | sed 's/\(.*\)\(-lglib.*\)/\1/'`"
LDFLAGS="$LDFLAGS `echo $GTK_LIBS | sed 's/\(.*\)\(-lgtk.*\)/\1/'`"
LIBS="$LIBS $GTK_LIBS"
......@@ -306,6 +307,7 @@ dnl check for difftime
AC_CHECK_FUNC(difftime, , AC_DEFINE(NO_DIFFTIME))
dnl Threads
AC_ARG_WITH(threads, [ --with-threads=[posix] support threading ])
if test "x$with_threads" = "xposix" || test "x$with_threads" = "xyes"; then
AC_CHECK_LIB(pthread, pthread_attr_init,
AC_DEFINE(USE_PTHREADS)
......@@ -404,6 +406,11 @@ AC_SUBST(GIMP_MINOR_VERSION)
AC_SUBST(GIMP_MICRO_VERSION)
AC_SUBST(GIMP_VERSION)
AC_SUBST(LT_RELEASE)
AC_SUBST(LT_CURRENT)
AC_SUBST(LT_REVISION)
AC_SUBST(LT_AGE)
AC_SUBST(gimpdir)
AC_SUBST(gimpdatadir)
AC_SUBST(gimpplugindir)
......
......@@ -12,21 +12,21 @@ EXTRA_DIST = $(brushdata_DATA)
.PHONY: files
FILES =\
10x10square.gbr \
FILES = \
10x10square.gbr \
10x10squareBlur.gbr \
11circle.gbr \
11fcircle.gbr \
13circle.gbr \
13fcircle.gbr \
15circle.gbr \
15fcircle.gbr \
17circle.gbr \
17fcircle.gbr \
19circle.gbr \
19fcircle.gbr \
1circle.gbr \
20x20square.gbr \
11circle.gb \
11fcircle.gbr \
13circle.gbr \
13fcircle.gbr \
15circle.gbr \
15fcircle.gbr \
17circle.gbr \
17fcircle.gbr \
19circle.gbr \
19fcircle.gbr \
1circle.gbr \
20x20square.gbr \
20x20squareBlur.gbr \
3circle.gbr \
3fcircle.gbr \
......
......@@ -12,82 +12,82 @@ EXTRA_DIST = $(gradientdata_DATA)
.PHONY: files
FILES =\
Abstract_1 \
Abstract_2 \
Abstract_3 \
Aneurism \
Blinds \
Blue_Green \
Browns \
Brushed_Aluminium \
Burning_Paper \
Burning_Transparency \
CD \
CD_Half \
Caribbean_Blues \
Coffee \
Cold_Steel \
Cold_Steel_2 \
Crown_molding \
Dark_1 \
Deep_Sea \
Default \
Flare_Glow_Angular_1 \
Flare_Glow_Radial_1 \
Flare_Glow_Radial_2 \
Flare_Glow_Radial_3 \
Flare_Glow_Radial_4 \
Flare_Radial_101 \
Flare_Radial_102 \
Flare_Radial_103 \
Flare_Rays_Radial_1 \
Flare_Rays_Radial_2 \
Flare_Rays_Size_1 \
Flare_Sizefac_101 \
Four_bars \
French_flag \
French_flag_smooth \
Full_saturation_spectrum_CCW \
Full_saturation_spectrum_CW \
German_flag \
German_flag_smooth \
Golden \
Greens \
Horizon_1 \
Horizon_2 \
Incandescent \
Land_1 \
Land_and_Sea \
Metallic_Something \
Mexican_flag \
Mexican_flag_smooth \
Nauseating_Headache \
Neon_Cyan \
Neon_Green \
Neon_Yellow \
Pastels \
Pastel_Rainbow \
Purples \
Radial_Eyeball_Blue \
Radial_Eyeball_Brown \
Radial_Eyeball_Green \
Radial_Glow_1 \
Radial_Rainbow_Hoop \
Romanian_flag \
Romanian_flag_smooth \
Rounded_edge \
Shadows_1 \
Shadows_2 \
Shadows_3 \
Skyline \
Skyline_polluted \
Square_Wood_Frame \
Sunrise \
Three_bars_sin \
Tropical_Colors \
Tube_Red \
Wood_1 \
Wood_2 \
Yellow_Contrast \
Yellow_Orange
FILES = \
Abstract_1 \
Abstract_2 \
Abstract_3 \
Aneurism \
Blinds \
Blue_Green \
Browns \
Brushed_Aluminium \
Burning_Paper \
Burning_Transparency \
CD \
CD_Half \
Caribbean_Blues \
Coffee \
Cold_Steel \
Cold_Steel_2 \
Crown_molding \
Dark_1 \
Deep_Sea \
Default \
Flare_Glow_Angular_1 \
Flare_Glow_Radial_1 \
Flare_Glow_Radial_2 \
Flare_Glow_Radial_3 \
Flare_Glow_Radial_4 \
Flare_Radial_101 \
Flare_Radial_102 \
Flare_Radial_103 \
Flare_Rays_Radial_1 \
Flare_Rays_Radial_2 \
Flare_Rays_Size_1 \
Flare_Sizefac_101 \
Four_bars \
French_flag \
French_flag_smooth \
Full_saturation_spectrum_CCW \
Full_saturation_spectrum_CW \
German_flag \
German_flag_smooth \
Golden \
Greens \
Horizon_1 \
Horizon_2 \
Incandescent \
Land_1 \
Land_and_Sea \
Metallic_Something \
Mexican_flag \
Mexican_flag_smooth \
Nauseating_Headache \
Neon_Cyan \
Neon_Green \
Neon_Yellow \
Pastels \
Pastel_Rainbow \
Purples \
Radial_Eyeball_Blue \
Radial_Eyeball_Brown \
Radial_Eyeball_Green \
Radial_Glow_1 \
Radial_Rainbow_Hoop \
Romanian_flag \
Romanian_flag_smooth \
Rounded_edge \
Shadows_1 \
Shadows_2 \
Shadows_3 \
Skyline \
Skyline_polluted \
Square_Wood_Frame \
Sunrise \
Three_bars_sin \
Tropical_Colors \
Tube_Red \
Wood_1 \
Wood_2 \
Yellow_Contrast \
Yellow_Orange
......@@ -12,41 +12,40 @@ EXTRA_DIST = $(palettedata_DATA)
.PHONY: files
FILES =\
Blues \
Bears \
Bgold \
Borders \
FILES = \
Blues \
Bears \
Bgold \
Borders \
Browns_And_Yellows \
Caramel \
China \
Coldfire \
Cool_Colors \
Cranes \
Dark_pastels \
Default \
Ega \
Firecode \
Gold \
Grayblue \
Grays \
GrayViolet \
Greens \
Hilite \
Kahki \
Lights \
Muted \
Named_Colors \
News3 \
Op2 \
Paintjet \
Pastels \
Plasma \
Reds \
Caramel \
China \
Coldfire \
Cool_Colors \
Cranes \
Dark_pastels \
Default \
Ega \
Firecode \
Gold \
Grayblue \
Grays \
GrayViolet \
Greens \
Hilite \
Kahki \
Lights \
Muted \
Named_Colors \
News3 \
Op2 \
Paintjet \
Pastels \
Plasma \
Reds \
Reds_And_Purples \
Royal \
Topographic \
Volcano \
Warm_Colors \
Web
Royal \
Topographic \
Volcano \
Warm_Colors \
Web
......@@ -12,62 +12,60 @@ EXTRA_DIST = $(patterndata_DATA)
.PHONY: files
FILES =\
3dgreen.pat \
Craters.pat \
Moonfoot.pat \
amethyst.pat \
bark.pat \
blue.pat \
bluegrid.pat \
bluesquares.pat \
blueweb.pat \
brick.pat \
burlap.pat \
burlwood.pat \
choc_swirl.pat \
corkboard.pat \
cracked.pat \
crinklepaper.pat \
electric.pat \
fibers.pat \
granite1.pat \
ground1.pat \
ice.pat \
java.pat \
leather.pat \
leaves.pat \
leopard.pat \
lightning.pat \
marble1.pat \
marble2.pat \
marble3.pat \
nops.pat \
paper.pat \
parque1.pat \
parque2.pat \
parque3.pat \
pastel.pat \
pine.pat \
pink_marble.pat \
pool.pat \
qube1.pat \
rain.pat \
recessed.pat \
redcube.pat \
rock.pat \
sky.pat \
slate.pat \
sm_squares.pat \
starfield.pat \
stone33.pat \
terra.pat \
walnut.pat \
warning.pat \
wood1.pat \
wood2.pat \
wood3.pat \
wood4.pat \
wood5.pat
FILES = \
3dgreen.pat \
Craters.pat \
Moonfoot.pat \
amethyst.pat \
bark.pat \
blue.pat \
bluegrid.pat \
bluesquares.pat \
blueweb.pat \
brick.pat \
burlap.pat \
burlwood.pat \
choc_swirl.pat \
corkboard.pat \
cracked.pat \
crinklepaper.pat \
electric.pat \
fibers.pat \
granite1.pat \
ground1.pat \
ice.pat \
java.pat \
leather.pat \
leaves.pat \
leopard.pat \
lightning.pat \
marble1.pat \
marble2.pat \
marble3.pat \
nops.pat \
paper.pat \
parque1.pat \
parque2.pat \
parque3.pat \
pastel.pat \
pine.pat \
pink_marble.pat \
pool.pat \
qube1.pat \
rain.pat \
recessed.pat \
redcube.pat \
rock.pat \
sky.pat \
slate.pat \
sm_squares.pat \
starfield.pat \
stone33.pat \
terra.pat \
walnut.pat \
warning.pat \
wood1.pat \
wood2.pat \
wood3.pat \
wood4.pat \
wood5.pat
......@@ -4,47 +4,57 @@ gimpincludedir = $(includedir)/libgimp
scriptdata =
lib_LTLIBRARIES = libgimp.la libgimpui.la
lib_LTLIBRARIES = libgimp-1.1.la libgimpui-1.1.la
noinst_LIBRARIES = libgimpi.a
libgimpi_a_SOURCES = gimpprotocol.c \
gimpprotocol.h \
gimpwire.c \
gimpwire.h
libgimpi_a_DEPENDENCIES = libgimp.la
libgimp_la_SOURCES = gimp.c \
gimpchannel.c \
gimpdisplay.c \
gimpdrawable.c \
gimpgradient.c \
gimpimage.c \
gimplayer.c \
gimppalette.c \
gimppixelrgn.c \
gimpprotocol.c \
gimpprotocol.h \
gimptile.c \
gimpwire.c \
gimpwire.h
libgimpui_la_SOURCES = gimpmenu.c
gimpinclude_HEADERS = gimp.h \
gimpenums.h \
gimpmenu.h \
gimpui.h
libgimp_la_LDFLAGS = -version-info 1:0:0
libgimpui_la_LDFLAGS = -version-info 1:0:0
libgimpi_a_SOURCES = \
gimpprotocol.c \
gimpprotocol.h \
gimpwire.c \
gimpwire.h
## Evil hack to insure all deps are satisfied on first-run make
libgimpi_a_DEPENDENCIES = libgimp-1.1.la
libgimp_1_1_la_SOURCES = \
gimp.c \
gimpchannel.c \
gimpdisplay.c \
gimpdrawable.c \
gimpgradient.c \
gimpimage.c \
gimplayer.c \
gimppalette.c \
gimppixelrgn.c \
gimpprotocol.c \
gimpprotocol.h \
gimptile.c \
gimpwire.c \
gimpwire.h
libgimpui_1_1_la_SOURCES = \
gimpmenu.c
gimpinclude_HEADERS = \
gimp.h \
gimpenums.h \
gimpmenu.h \
gimpui.h
libgimp_1_1_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
libgimpui_1_1_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
CPPFLAGS = \
-DGIMPDIR=\""$(gimpdir)"\"
INCLUDES = \
$(X_CFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir) \
$(GLIB_CFLAGS) \
-I$(includedir)
libgimpui_1_1_la_INCLUDES = \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
-I$(includedir)
.PHONY: files
......
......@@ -5,22 +5,23 @@ pluginlibdir = $(gimpplugindir)/plug-ins
pluginlib_PROGRAMS = AlienMap
AlienMap_SOURCES = \
AlienMap.c logo.h
AlienMap.c \
logo.h
INCLUDES = \
$(X_CFLAGS) \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
-I$(includedir)
LDADD = \
$(top_builddir)/libgimp/libgimpui.la \
$(top_builddir)/libgimp/libgimp.la \
$(X_LIBS) \
$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \
$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \
$(GTK_LIBS) \
-lc
DEPS = \
$(top_builddir)/libgimp/libgimpui.la \
$(top_builddir)/libgimp/libgimp.la
$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \
$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la
AlienMap_DEPENDENCIES = $(DEPS)
......@@ -36,8 +37,3 @@ files:
echo $$subdir/$$file; \
done; \
done
......@@ -8,20 +8,19 @@ CEL_SOURCES = \
CEL.c
INCLUDES = \
$(X_CFLAGS) \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
-I$(includedir)
LDADD = \
$(top_builddir)/libgimp/libgimpui.la \
$(top_builddir)/libgimp/libgimp.la \
$(X_LIBS) \
\
$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \
$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \
$(GTK_LIBS) \
-lc
DEPS = \
$(top_builddir)/libgimp/libgimpui.la \
$(top_builddir)/libgimp/libgimp.la
$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \
$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la
CEL_DEPENDENCIES = $(DEPS)
......
......@@ -8,20 +8,19 @@ CML_explorer_SOURCES = \
CML_explorer.c
INCLUDES = \
$(X_CFLAGS) \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
-I$(includedir)
LDADD = \
$(top_builddir)/libgimp/libgimpui.la \
$(top_builddir)/libgimp/libgimp.la \
$(X_LIBS) \
\
$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \
$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \
$(GTK_LIBS) \
-lc
DEPS = \
$(top_builddir)/libgimp/libgimpui.la \
$(top_builddir)/libgimp/libgimp.la
$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \
$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la
CML_explorer_DEPENDENCIES = $(DEPS)
......
......@@ -5,24 +5,46 @@ pluginlibdir = $(gimpplugindir)/plug-ins
pluginlib_PROGRAMS = Lighting