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

bumped version number to 1.3.25, interface_age 1, binary age 1.

Browse Source 
2004-01-09  Sven Neumann  <sven@gimp.org>

	* configure.in: bumped version number to 1.3.25, interface_age 1,
	binary age 1.

	* Makefile.am
	* gimp-2.0.pc.in
	* gimpthumb-2.0.pc.in
	* gimpui-2.0.pc.in: renamed the pkg-config files.

	* gimptool-2.0.in
	* docs/Makefile.am
	* docs/gimptool-2.0.1.in: renamed gimptool and it's manpage.

	* gimp.spec.in
	* m4macros/gimp-2.0.m4: changed accordingly.
This commit is contained in:
Sven Neumann
2004-01-09 00:09:51 +00:00
committed by Sven Neumann
parent 8e6ce45355
commit bd5827d0d9
20 changed files with 74 additions and 646 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.cvsignore
View File

@ -12,11 +12,11 @@ config.guess
config.sub
ltmain.sh
gimp.spec
gimptool-1.3
gimptool-2.0
gimptool-win32.c
gimp-1.3.pc
gimpthumb-1.3.pc
gimpui-1.3.pc
gimp-2.0.pc
gimpthumb-2.0.pc
gimpui-2.0.pc
gimp-zip
intltool-extract
intltool-extract.in

17
ChangeLog
View File

@ -1,3 +1,20 @@
2004-01-09 Sven Neumann <sven@gimp.org>
* configure.in: bumped version number to 1.3.25, interface_age 1,
binary age 1.
* Makefile.am
* gimp-2.0.pc.in
* gimpthumb-2.0.pc.in
* gimpui-2.0.pc.in: renamed the pkg-config files.
* gimptool-2.0.in
* docs/Makefile.am
* docs/gimptool-2.0.1.in: renamed gimptool and it's manpage.
* gimp.spec.in
* m4macros/gimp-2.0.m4: changed accordingly.
2004-01-08 Raphaël Quinet <quinet@gamers.org>
* plug-ins/common/jpeg.c: applied a (slightly modified) patch from

10
Makefile.am
View File

@ -26,13 +26,13 @@ SUBDIRS = \
$(GIMP_DEVEL_DOCS) \
docs
bin_SCRIPTS = gimptool-$(LT_RELEASE) @GIMPINSTALL@
bin_SCRIPTS = gimptool-2.0 @GIMPINSTALL@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = \
gimp-$(LT_RELEASE).pc \
gimpthumb-$(LT_RELEASE).pc \
gimpui-$(LT_RELEASE).pc
gimp-2.0.pc \
gimpthumb-2.0.pc \
gimpui-2.0.pc
EXTRA_SCRIPTS = gimpinstall-$(LT_RELEASE)
@ -78,7 +78,7 @@ install-exec-hook:
if DEFAULT_BINARY
cd $(DESTDIR)$(bindir) \
&& rm -f gimptool \
&& $(LN_S) gimptool-$(LT_RELEASE) gimptool
&& $(LN_S) gimptool-2.0 gimptool
endif
uninstall-local:

21
configure.in
View File

@ -47,11 +47,12 @@ AC_SUBST(WMF_REQUIRED_VERSION)
#
GIMP_MAJOR_VERSION=1
GIMP_MINOR_VERSION=3
GIMP_MICRO_VERSION=24
GIMP_INTERFACE_AGE=0
GIMP_BINARY_AGE=0
GIMP_MICRO_VERSION=25
GIMP_INTERFACE_AGE=1
GIMP_BINARY_AGE=1
#GIMP_VERSION=$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION.$GIMP_MICRO_VERSION
GIMP_VERSION=2.0pre1
GIMP_VERSION=2.0pre2
AC_SUBST(GIMP_MAJOR_VERSION)
AC_SUBST(GIMP_MINOR_VERSION)
@ -1503,7 +1504,7 @@ devel-docs/libgimpwidgets/version
docs/Makefile
docs/gimp-1.3.1
docs/gimprc-1.3.5
docs/gimptool-1.3.1
docs/gimptool-2.0.1
docs/gimp-remote-1.3.1
tips/Makefile
cursors/Makefile
@ -1527,17 +1528,17 @@ po/Makefile.in
po-libgimp/Makefile.in
po-plug-ins/Makefile.in
po-script-fu/Makefile.in
gimptool-1.3
gimp-1.3.pc
gimpthumb-1.3.pc
gimpui-1.3.pc
gimptool-2.0
gimp-2.0.pc
gimpthumb-2.0.pc
gimpui-2.0.pc
gimp.spec
gimp-zip
Makefile
])
AC_CONFIG_COMMANDS([chmod-scripts],
[chmod +x gimptool-1.3])
[chmod +x gimptool-2.0])
AC_CONFIG_COMMANDS([sed-po-makefiles],
[sed -e "/POTFILES =/r po-libgimp/POTFILES" po-libgimp/Makefile.in > po-libgimp/Makefile

2
docs/.cvsignore
View File

@ -4,7 +4,7 @@ Makefile.in
gimp-1.3.1
gimprc-1.3.5
gimp-remote-1.3.1
gimptool-1.3.1
gimptool-2.0.1
Wilber.xcf
Wilber_Construction_Kit.xcf
quick_reference

4
docs/Makefile.am
View File

@ -2,14 +2,14 @@
man_MANS = \
gimp-$(LT_RELEASE).1 \
gimptool-$(LT_RELEASE).1 \
gimptool-2.0.1 \
gimprc-$(LT_RELEASE).5 \
gimp-remote-$(LT_RELEASE).1
EXTRA_DIST = \
gimp-$(LT_RELEASE).1.in \
gimprc-$(LT_RELEASE).5.in \
gimptool-$(LT_RELEASE).1.in \
gimptool-2.0.1.in \
gimp-remote-$(LT_RELEASE).1.in \
Wilber.svg \
Wilber.xcf.gz \

225
docs/gimptool-1.3.1.in
View File

@ -1,225 +0,0 @@
.TH GIMPTOOL-1.3 1 "25 November 2001" "Version @GIMP_VERSION@" "GIMP Manual Pages"
.SH NAME
gimptool-1.3 - script to perform various GIMPy functions
.SH SYNOPSIS
.B gimptool-1.3
[\-\-prefix\fI[=DIR]\fP] [\-\-exec\-prefix\fI[=DIR]\fP] [\-\-version]
[\-\-help] [\-\-quiet] [\-\-silent] [\-n] [\-\-just-print] [\-\-dry-run]
[\-\-recon] [\-\-bindir] [\-\-sbindir] [\-\-libexecdir] [\-\-datadir]
[\-\-sysconfdir] [\-\-sharedstatedir] [\-\-localstatedir] [-\-libdir]
[\-\-infodir] [\-\-mandir] [\-\-includedir] [\-\-gimpplugindir]
[\-\-gimpdatadir] [\-\-libs] [\-\-libs-noui] [\-\-cflags] [\-\-cflags-noi]
[\-\-build \fIplug\-in.c\fP]
[\-\-build\-strip \fIplug\-in.c\fP] [\-\-install \fIplug\-in.c\fP]
[\-\-install-strip \fIplug\-in.c\fP] [\-\-install-admin \fIplug-in.c\fP]
[\-\-install\-bin \fIplug\-in\fP]
[\-\-install\-admin\-strip \fIplug-in.c\fP]
[\-\-install\-bin\-strip \fIplug\-in\fP]
[\-\-\install\-admin\-bin \fIplug\-in\fP]
[\-\-install\-script \fIscript.scm\fP]
[\-\-\install\-admin\-script \fIscript.scm\fP]
[\-\-uninstall\-bin \fIplug\-in\fP] [\-\-uninstall\-admin\-bin \fIplug\-in\fP]
[\-\-uninstall\-script \fIscript.scm\fP]
[\-\-uninstall\-admin\-script \fIscript.scm\fP]
.SH DESCRIPTION
.PP
\fIgimptool-1.3\fP is a tool that can, among other things, build
plug-ins or scripts and install them if they are distributed in one
source file.
.PP
\fIgimptool-1.3\fP can also be used by programs that need to know what
libraries and include-paths \fIGIMP\fP was compiled with. This is
especially useful in Makefiles.
.SH OPTIONS
.l
\fIgimptool-1.3\fP accepts the following options:
.TP 8
.B \-\-version
Print the currently installed version of \fIGIMP\fP on the standard output.
.TP 8
.B \-\-help
Print out the help blurb, showing commonly used commandline options.
.TP 8
.B \-\-quiet
Run quietly without echoing any of the build commands.
.TP 8
.B \-\-silent
Run silently without echoing any of the build commands. Same as \-\-quiet.
.TP 8
.B \-n
Test mode. Print the commands but dont actually execute them. Useful for
making dry runs for testing.
.TP 8
.B \-\-just-print
Test mode. Print the commands but dont actually execute them. Same as \-n.
.TP 8
.B \-\-dry-run
Test mode. Print the commands but dont actually execute them. Same as \-n.
.TP 8
.B \-\-recon
Test mode. Print the commands but dont actually execute them. Same as \-n.
.TP 8
.B \-\-bindir
Outputs the bindir used to install the \fIGIMP\fP.
.TP 8
.B \-\-sbindir
Outputs the sbindir used to install the \fIGIMP\fP.
.TP 8
.B \-\-libexecdir
Outputs the libexecdir used to install the \fIGIMP\fP.
.TP 8
.B \-\-datadir
Outputs the datadir used to install the \fIGIMP\fP.
.TP 8
.B \-\-sysconfdir
Outputs the sysconfdir used to install the \fIGIMP\fP.
.TP 8
.B \-\-sharedstatedir
Outputs the sharedstatedir used to install the \fIGIMP\fP.
.TP 8
.B \-\-localstatedir
Outputs the localstatedir used to install the \fIGIMP\fP.
.TP 8
.B \-\-libdir
Outputs the libdir used to install the \fIGIMP\fP.
.TP 8
.B \-\-infodir
Outputs the infodir used to install the \fIGIMP\fP.
.TP 8
.B \-\-mandir
Outputs the mandir used to install the \fIGIMP\fP.
.TP 8
.B \-\-includedir
Outputs the includedir used to install the \fIGIMP\fP.
.TP 8
.B \-\-gimpdatadir
Outputs the actual directory where the \fIGIMP\fP data files were installed.
.TP 8
.B \-\-gimpplugindir
Outputs the actual directory where the \fIGIMP\fP plugins were installed.
.TP 8
.B \-\-build \fIplug-in.c\fP
Compile and link \fIplug-in.c\fP into a \fIGIMP\fP plug-in.
.TP 8
.B \-\-build\-strip \fIplug-in.c\fP
Compile,link, and strip \fIplug-in.c\fP into a \fIGIMP\fP plug-in.
.TP 8
.B \-\-install \fIplug-in.c\fP
Compile, link, and install \fIplug-in.c\fP into the user's personal
\fIGIMP\fP plug-in directory (\fB$HOME\fP/@gimpdir@/plug-ins)
.TP 8
.B \-\-install\-strip \fIplug-in.c\fP
Compile, link,strip, and install \fIplug-in.c\fP into the user's
personal \fIGIMP\fP
plug-in directory (\fB$HOME\fP/@gimpdir@/plug-ins)
.TP 8
.B \-\-install\-admin \fIplug-in.c\fP
Compile, link, and install \fIplug-in.c\fP into the system-wide \fIGIMP\fP
plug-in directory (@gimpplugindir@/plug-ins)
.TP 8
.B \-\-install\-bin \fIplug-in\fP
Install \fIplug-in\fP into the user's personal \fIGIMP\fP
plug-in directory (\fB$HOME\fP/@gimpdir@/plug-ins)
.TP 8
.B \-\-install\-admin\-bin \fIplug-in\fP
Install \fIplug-in\fP into the system-wide \fIGIMP\fP
plug-in directory (@gimpplugindir@/plug-ins)
.TP 8
.B \-\-install\-bin\-strip \fIplug-in\fP
Install stripped \fIplug-in\fP into the user's personal \fIGIMP\fP
plug-in directory (\fB$HOME\fP/@gimpdir@/plug-ins)
.TP 8
.B \-\-install\-admin\-bin\-strip \fIplug-in\fP
Install stripped \fIplug-in\fP into the system-wide \fIGIMP\fP
plug-in directory (@gimpplugindir@/plug-ins)
.TP 8
.B \-\-install\-script \fIscript.scm\fP
Install \fIscript.scm\fP into the user's personal \fIGIMP\fP
script directory (\fB$HOME\fP/@gimpdir@/scripts)
.TP 8
.B \-\-install\-admin\-script \fIscript.scm\fP
Install \fIscript.scm\fP into the system-wide \fIGIMP\fP
script directory (@gimpdatadir@/scripts)
.TP 8
.B \-\-uninstall\-bin \fIplug-in\fP
Uninstall \fIplug-in\fP from the user's personal \fIGIMP\fP
plug-in directory (\fB$HOME\fP/@gimpdir@/plug-ins)
.TP 8
.B \-\-uninstall\-admin\-bin \fIplug-in\fP
Uninstall \fIplug-in\fP from the system-wide \fIGIMP\fP
plug-in directory (@gimpplugindir@/plug-ins)
.TP 8
.B \-\-uninstall\-script \fIscript.scm\fP
Uninstall \fIscript.scm\fP from the user's personal \fIGIMP\fP
script directory (\fB$HOME\fP/@gimpdir@/scripts)
.TP 8
.B \-\-uninstall\-admin\-script \fIscript.scm\fP
Uninstall \fIscript.scm\fP from the system-wide \fIGIMP\fP
script directory (@gimpdatadir@/scripts)
.TP 8
.B \-\-libs
Print the linker flags that are necessary to link a \fIGIMP\fP plug-in.
.TP 8
.B \-\-libs-noui
Print the linker flags that are necessary to link a \fIGIMP\fP plug-in, for
plugins that do not require the GTK libs.
.TP 8
.B \-\-cflags
Print the compiler flags that are necessary to compile a \fIGIMP\fP plug-in.
.TP 8
.B \-\-clags-noui
Print the compiler flags that are necessary to compile a \fIGIMP\fP plug-in
for plugins that do not require the GTK libs.
.TP 8
.B \-\-prefix=PREFIX
If specified, use PREFIX instead of the installation prefix that \fIGIMP\fP
was built with when computing the output for the \-\-cflags and
\-\-libs options. This option is also used for the exec prefix
if \-\-exec\-prefix was not specified. This option must be specified
before any \-\-libs or \-\-cflags options.
.TP 8
.B \-\-exec\-prefix=PREFIX
If specified, use PREFIX instead of the installation exec prefix that
\fIGIMP\fP was built with when computing the output for the \-\-cflags
and \-\-libs options. This option must be specified before any
\-\-libs or \-\-cflags options.
.SH ENVIRONMENT
.PP
.TP 8
.B CC
to get the name of the desired C compiler.
.TP 8
.B CFLAGS
to get the preferred flags to pass to the C compiler for plug-in building.
.TP 8
.B DESTDIR
to add a prefix to the install/uninstall path.
.TP 8
.B LDFLAGS
to get the prefered flags for passing to the linker.
.TP 8
.B LIBS
for passing extra libs that may be needed in the build process. For example,
LIBS=-lintl .
.TP 8
.B PKG_CONFIG
to get the location of the pkg-config program used to determine details
about your glib, pango and gtk+ installation.
.SH SEE ALSO
.BR gimp (1),
.BR gimprc (5),
.BR pkg-config (1)
.SH AUTHORS
gimptool was written by Manish Singh (yosh@gimp.org) and is based on
gtk-config by Owen Taylor (owen@gtk.org).
This man page was written by Ben Gertzfield (che@debian.org), and tweaked
by Manish Singh (yosh@gimp.org), Adrian Likins (adrian@gimp.org) and Marc
Lehmann (pcg@goof.com>).

12
docs/gimptool-2.0.1.in
View File

@ -1,8 +1,8 @@
.TH GIMPTOOL-1.3 1 "25 November 2001" "Version @GIMP_VERSION@" "GIMP Manual Pages"
.TH GIMPTOOL-2.0 1 "8 January 2004" "Version @GIMP_VERSION@" "GIMP Manual Pages"
.SH NAME
gimptool-1.3 - script to perform various GIMPy functions
gimptool-2.0 - script to perform various GIMPy functions
.SH SYNOPSIS
.B gimptool-1.3
.B gimptool-2.0
[\-\-prefix\fI[=DIR]\fP] [\-\-exec\-prefix\fI[=DIR]\fP] [\-\-version]
[\-\-help] [\-\-quiet] [\-\-silent] [\-n] [\-\-just-print] [\-\-dry-run]
[\-\-recon] [\-\-bindir] [\-\-sbindir] [\-\-libexecdir] [\-\-datadir]
@ -25,17 +25,17 @@ gimptool-1.3 - script to perform various GIMPy functions
.SH DESCRIPTION
.PP
\fIgimptool-1.3\fP is a tool that can, among other things, build
\fIgimptool-2.0\fP is a tool that can, among other things, build
plug-ins or scripts and install them if they are distributed in one
source file.
.PP
\fIgimptool-1.3\fP can also be used by programs that need to know what
\fIgimptool-2.0\fP can also be used by programs that need to know what
libraries and include-paths \fIGIMP\fP was compiled with. This is
especially useful in Makefiles.
.SH OPTIONS
.l
\fIgimptool-1.3\fP accepts the following options:
\fIgimptool-2.0\fP accepts the following options:
.TP 8
.B \-\-version
Print the currently installed version of \fIGIMP\fP on the standard output.

12
docs/gimptool.1.in
View File

@ -1,8 +1,8 @@
.TH GIMPTOOL-1.3 1 "25 November 2001" "Version @GIMP_VERSION@" "GIMP Manual Pages"
.TH GIMPTOOL-2.0 1 "8 January 2004" "Version @GIMP_VERSION@" "GIMP Manual Pages"
.SH NAME
gimptool-1.3 - script to perform various GIMPy functions
gimptool-2.0 - script to perform various GIMPy functions
.SH SYNOPSIS
.B gimptool-1.3
.B gimptool-2.0
[\-\-prefix\fI[=DIR]\fP] [\-\-exec\-prefix\fI[=DIR]\fP] [\-\-version]
[\-\-help] [\-\-quiet] [\-\-silent] [\-n] [\-\-just-print] [\-\-dry-run]
[\-\-recon] [\-\-bindir] [\-\-sbindir] [\-\-libexecdir] [\-\-datadir]
@ -25,17 +25,17 @@ gimptool-1.3 - script to perform various GIMPy functions
.SH DESCRIPTION
.PP
\fIgimptool-1.3\fP is a tool that can, among other things, build
\fIgimptool-2.0\fP is a tool that can, among other things, build
plug-ins or scripts and install them if they are distributed in one
source file.
.PP
\fIgimptool-1.3\fP can also be used by programs that need to know what
\fIgimptool-2.0\fP can also be used by programs that need to know what
libraries and include-paths \fIGIMP\fP was compiled with. This is
especially useful in Makefiles.
.SH OPTIONS
.l
\fIgimptool-1.3\fP accepts the following options:
\fIgimptool-2.0\fP accepts the following options:
.TP 8
.B \-\-version
Print the currently installed version of \fIGIMP\fP on the standard output.

14
gimp-1.3.pc.in
View File

@ -1,14 +0,0 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
gimpdatadir=@gimpdatadir@
gimplibdir=@gimpplugindir@
Name: GIMP
Description: GIMP Library
Version: @GIMP_MAJOR_VERSION@.@GIMP_MINOR_VERSION@.@GIMP_MICRO_VERSION@
Requires: glib-2.0
Libs: -L${libdir} -lgimpbase-1.3 -lgimpcolor-1.3 -lgimpmath-1.3 -lgimp-1.3
Cflags: -I${includedir}/gimp-1.3

11
gimp.spec.in
View File

@ -194,7 +194,7 @@ cat gimp-plugin-files gimp-tips-files > gimp.files
%files devel
%defattr (0555, bin, bin, 0555)
%{prefix}/bin/gimptool-%{subver}
%{prefix}/bin/gimptool-2.0
%{prefix}/lib/*.so
%{prefix}/lib/*.la
%dir %{prefix}/lib/gimp/%{subver}
@ -202,9 +202,9 @@ cat gimp-plugin-files gimp-tips-files > gimp.files
%{prefix}/lib/gimp/%{subver}/modules/*.la
%defattr (0444, root, root, 0555)
%{prefix}/lib/pkgconfig/gimp-%{subver}.pc
%{prefix}/lib/pkgconfig/gimpui-%{subver}.pc
%{prefix}/lib/pkgconfig/gimpthumb-%{subver}.pc
%{prefix}/lib/pkgconfig/gimp-2.0.pc
%{prefix}/lib/pkgconfig/gimpui-2.0.pc
%{prefix}/lib/pkgconfig/gimpthumb-2.0.pc
%dir %{prefix}/include/gimp-%{subver}/libgimpbase
%{prefix}/include/gimp-%{subver}/libgimpbase/*
@ -241,6 +241,9 @@ cat gimp-plugin-files gimp-tips-files > gimp.files
%{prefix}/share/gtk-doc/html/libgimpwidgets
%changelog
* Thu Jan 08 2004 Sven Neumann <sven@gimp.org>
- gimptool and pkg-config files changed names
* Wed Oct 08 2003 Ville P<>tsi <drc@gimp.org>
- Enabled debug packages again.

11
gimpthumb-1.3.pc.in
View File

@ -1,11 +0,0 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
Name: GIMP Thumb
Description: GIMP Thumbnail Library
Version: @VERSION@
Requires: gdk-pixbuf-2.0
Libs: -L${libdir} -lgimpmath-1.3 -lgimpthumb-1.3
Cflags: -I${includedir}/gimp-1.3

6
gimpthumb-2.0.pc.in
View File

@ -5,7 +5,7 @@ includedir=@includedir@
Name: GIMP Thumb
Description: GIMP Thumbnail Library
Version: @VERSION@
Version: @GIMP_MAJOR_VERSION@.@GIMP_MINOR_VERSION@.@GIMP_MICRO_VERSION@
Requires: gdk-pixbuf-2.0
Libs: -L${libdir} -lgimpmath-1.3 -lgimpthumb-1.3
Cflags: -I${includedir}/gimp-1.3
Libs: -L${libdir} -lgimpmath-@LT_RELEASE@ -lgimpthumb-@LT_RELEASE@
Cflags: -I${includedir}/gimp-@LT_RELEASE@

6
gimpthumb.pc.in
View File

@ -5,7 +5,7 @@ includedir=@includedir@
Name: GIMP Thumb
Description: GIMP Thumbnail Library
Version: @VERSION@
Version: @GIMP_MAJOR_VERSION@.@GIMP_MINOR_VERSION@.@GIMP_MICRO_VERSION@
Requires: gdk-pixbuf-2.0
Libs: -L${libdir} -lgimpmath-1.3 -lgimpthumb-1.3
Cflags: -I${includedir}/gimp-1.3
Libs: -L${libdir} -lgimpmath-@LT_RELEASE@ -lgimpthumb-@LT_RELEASE@
Cflags: -I${includedir}/gimp-@LT_RELEASE@

332
gimptool-1.3.in
View File

@ -1,332 +0,0 @@
#! /bin/sh
prefix=@prefix@
exec_prefix=@exec_prefix@
exec_prefix_set=no
bindir=@bindir@
sbindir=@sbindir@
libexecdir=@libexecdir@
datadir=@datadir@
sysconfdir=@sysconfdir@
sharedstatedir=@sharedstatedir@
localstatedir=@localstatedir@
libdir=@libdir@
infodir=@infodir@
mandir=@mandir@
includedir=@includedir@
gimpplugindir=@gimpplugindir@
gimpdatadir=@gimpdatadir@
rt_libs=@RT_LIBS@
usage()
{
cat <<EOF
Usage: gimptool-1.3 [OPTION]...
General options:
--help print this message
--quiet, --silent don't echo build commands
--version print the version of GIMP associated with this script
-n, --just-print, --dry-run, --recon
don't actually run any commands; just print them
Developer options:
--cflags print the compiler flags that are necessary to
compile a plug-in
--libs print the linker flags that are necessary to link a
plug-in
--prefix=PREFIX use PREFIX instead of the installation prefix that
GIMP was built when computing the output for --cflags
and --libs
--exec-prefix=PREFIX use PREFIX instead of the installation exec prefix
that GIMP was built when computing the output for
--cflags and --libs
Installation directory options:
--prefix --exec-prefix --bindir --sbindir --libexecdir --datadir --sysconfdir
--sharedstatedir --localstatedir --libdir --infodir --mandir --includedir
--gimpplugindir --gimpdatadir
The --cflags and --libs options can be appended with -noui to get appropriate
settings for plug-ins which do not use GTK+.
User options:
--build plug-in.c build a plug-in from a source file
--install plug-in.c same as --build, but installs the built
plug-in as well
--install-bin plug-in install a compiled plug-in
--install-script script.scm install a script-fu script
--uninstall-bin plug-in remove a plug-in again
--uninstall-script plug-in remove a script-fu script
The --install and --uninstall options have "admin" counterparts (with
prefix --install-admin instead of --install) that can be used instead to
install/uninstall a plug-in or script in the site directory instead of a
user directory.
For plug-ins which do not use GTK+, the --build and --install options can be
appended with -noui for appropriate settings. For plug-ins that use GTK+ but
not libgimpui, append -nogimpui.
All binary build and install options can be appended with -strip to discard
debugging information.
EOF
exit $1
}
noarg="\
Error: Need a plug-in source file to build"
notfound="\
Error: Couldn't find file to build/install/uninstall"
quiet=no
donothing=no
if test $# -eq 0; then
usage 1
fi
if test x${PKG_CONFIG+set} != xset ; then
gtk_cflags='@GTK_CFLAGS@'
gtk_libs='@GTK_LIBS@'
glib_cflags='@GLIB_CFLAGS@'
glib_libs='@GLIB_LIBS@'
else
gtk_cflags=`$PKG_CONFIG --cflags gtk+-2.0`
gtk_libs=`$PKG_CONFIG --libs gtk+-2.0`
glib_cflags=`$PKG_CONFIG --cflags glib-2.0`
glib_libs=`$PKG_CONFIG --libs glib-2.0`
fi
if test x${INSTALL+set} != xset ; then
INSTALL='@INSTALL@'
if test "$INSTALL" = "./install-sh -c"; then
mydirname=`echo $0 | sed -e 's#\(.*\)/[^/].*$#\1#'`
INSTALL="$mydirname/gimpinstall"
fi
fi
if test x${CC+set} != xset ; then
cc='@CC@'
else
cc="$CC"
fi
if test x${CFLAGS+set} != xset ; then
cflags='@CFLAGS@'
else
cflags="$CFLAGS"
fi
if test x${LDFLAGS+set} != xset ; then
ldflags='@LDFLAGS@'
else
ldflags="$LDFLAGS"
fi
if test x${LIBS+set} != xset ; then
libs=""
else
libs="$LIBS"
fi
while test $# -gt 0; do
case "$1" in
-*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
*) optarg= ;;
esac
case $1 in
--version)
echo @GIMP_VERSION@
exit 0
;;
--help)
usage 0
;;
--quiet | --silent)
quiet=yes
;;
-n | --just-print | --dry-run | --recon)
donothing=yes
;;
--prefix=*)
prefix=$optarg
if test $exec_prefix_set = no ; then
exec_prefix=$optarg
fi
;;
--prefix)
echo $prefix
;;
--exec-prefix=*)
exec_prefix=$optarg
exec_prefix_set=yes
;;
--exec-prefix)
echo $exec_prefix
;;
--*dir)
dirname=\$`echo $1 | sed -e 's,^--,,'`
dirname=`eval echo $dirname`
test -z "$dirname" && exit 1
echo $dirname
exit 0
;;
--cflags | --cflags-noui | --cflags-nogimpui)
case $1 in
--cflags | --cflags-nogimpui)
my_gtk_cflags=$gtk_cflags ;;
--cflags-noui)
my_gtk_cflags=$glib_cflags ;;
esac
includes=-I@includedir@/gimp-@LT_RELEASE@
echo $includes $my_gtk_cflags
;;
--libs | --libs-nogimpui)
my_gtk_libs=
libdirs=-L@libdir@
for i in $gtk_libs ; do
if test $i != -L@libdir@ ; then
if test -z "$my_gtk_libs" ; then
my_gtk_libs="$i"
else
my_gtk_libs="$my_gtk_libs $i"
fi
fi
done
case $1 in
--libs)
echo $libdirs -lgimpui-@LT_RELEASE@ -lgimpwidgets-@LT_RELEASE@ -lgimp-@LT_RELEASE@ -lgimpcolor-@LT_RELEASE@ -lgimpmath-@LT_RELEASE@ -lgimpbase-@LT_RELEASE@ $my_gtk_libs $rt_libs ;;
--libs-nogimpui)
echo $libdirs -lgimp-@LT_RELEASE@ -lgimpcolor-@LT_RELEASE@ -lgimpmath-@LT_RELEASE@ -lgimpbase-@LT_RELEASE@ $my_gtk_libs $rt_libs ;;
esac
;;
--libs-noui)
echo -L@libdir@ -lgimp-@LT_RELEASE@ -lgimpcolor-@LT_RELEASE@ -lgimpmath-@LT_RELEASE@ -lgimpbase-@LT_RELEASE@ $glib_libs $rt_libs
;;
--install-bin | --install-admin-bin \
| --install-bin-strip | --install-admin-bin-strip \
| --install-script | --install-admin-script \
| --uninstall-bin | --uninstall-admin-bin \
| --uninstall-script | --uninstall-admin-script )
case $1 in
--*install-bin)
install_cmd="@INSTALL_PROGRAM@"
install_dir="$HOME/@gimpdir@/plug-ins"
;;
--install-bin-strip)
install_cmd="@INSTALL_PROGRAM@ -s"
install_dir="$HOME/@gimpdir@/plug-ins"
;;
--*install-admin-bin)
install_cmd="@INSTALL_PROGRAM@"
install_dir="$gimpplugindir/plug-ins"
;;
--install-admin-bin-strip)
install_cmd="@INSTALL_PROGRAM@ -s"
install_dir="$gimpplugindir/plug-ins"
;;
--*install-script)
install_cmd="@INSTALL_DATA@"
install_dir="$HOME/@gimpdir@/scripts"
;;
--*install-admin-script)
install_cmd="@INSTALL_DATA@"
install_dir="$gimpdatadir/scripts"
;;
esac
case $1 in
--uninstall-* )
shift
if test "x$1" != "x"; then
dest=`echo $1 | sed -e 's#.*/\([^/].*\)$#\1#'`
if test -f "$DESTDIR$install_dir/$dest"; then
cmd="rm -f $DESTDIR$install_dir/$dest"
test $quiet = "yes" || echo $cmd
test $donothing = "yes" || exec $cmd
else
echo "${notfound}" 1>&2
exit 1
fi
else
echo "${noarg}" 1>&2
exit 1
fi
;;
*)
shift
if test "x$1" != "x"; then
if test -r "$1"; then
dest=`echo $1 | sed -e 's#.*/\([^/].*\)$#\1#'`
cmd="$install_cmd $1 $DESTDIR$install_dir/$dest"
test $quiet = "yes" || echo $cmd
test $donothing = "yes" || exec $cmd
else
echo "${notfound}" 1>&2
exit 1
fi
else
echo "${noarg}" 1>&2
exit 1
fi
;;
esac
;;
--build | --install | --install-admin | --build-strip | --install-strip \
| --install-admin-strip | --build-nogimpui | --install-nogimpui \
| --install-admin-nogimpui | --build-nogimpui-strip \
| --install-nogimpui-strip | --install-admin-nogimpui-strip \
| --build-noui | --install-noui | --install-admin-noui \
| --build-noui-strip | --install-noui-strip | --install-admin-noui-strip)
opt=`echo $1 | sed 's/-strip$//'`
if test "x$opt" != "x$1" ; then
cflags=`echo $cflags | sed -e 's/-g //g' -e 's/ -g//g'`
fi
case $opt in
--build | --build-noui | --build-nogimpui)
install_dir=. ;;
--install | --install-noui | --install-nogimpui)
install_dir="$HOME/@gimpdir@/plug-ins" ;;
--install-admin | --install-admin-noui | --install-admin-nogimpui)
install_dir="$gimpplugindir/plug-ins" ;;
esac
noui=`echo $opt | sed 's/^.*\(noui\)$/\1/'`
nogimpui=`echo $opt | sed 's/^.*\(nogimpui\)$/\1/'`
if test "$noui" = "noui" ; then
gimp_cflags=`$0 --cflags-noui`
gimp_libs=`$0 --libs-noui`
elif test "$nogimpui" = "nogimpui" ; then
gimp_cflags=`$0 --cflags-nogimpui`
gimp_libs=`$0 --libs-nogimpui`
else
gimp_cflags=`$0 --cflags`
gimp_libs=`$0 --libs`
fi
shift
if test "x$1" != "x"; then
if test -r "$1"; then
dest=`echo $1 | sed -e 's#.*/\([^/].*\)$#\1#' -e 's/\.[^.]*$//'`
cmd="$cc $cflags $gimp_cflags -o $install_dir/$dest $1 $ldflags $gimp_libs $libs"
test $quiet = "yes" || echo $cmd
test $donothing = "yes" || exec $cmd
else
echo "${notfound}" 1>&2
exit 1
fi
else
echo "${noarg}" 1>&2
exit 1
fi
;;
*)
usage 1
;;
esac
shift
done

2
gimptool-2.0.in
View File

@ -24,7 +24,7 @@ rt_libs=@RT_LIBS@
usage()
{
cat <<EOF
Usage: gimptool-1.3 [OPTION]...
Usage: gimptool-2.0 [OPTION]...
General options:
--help print this message

11
gimpui-1.3.pc.in
View File

@ -1,11 +0,0 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
Name: GIMP UI
Description: GIMP User Interface Library
Version: @GIMP_MAJOR_VERSION@.@GIMP_MINOR_VERSION@.@GIMP_MICRO_VERSION@
Requires: gimp-1.3 gtk+-2.0 >= 2.2.0
Libs: -L${libdir} -lgimpui-1.3 -lgimpwidgets-1.3
Cflags: -I${includedir}/gimp-1.3

6
gimpui-2.0.pc.in
View File

@ -6,6 +6,6 @@ includedir=@includedir@
Name: GIMP UI
Description: GIMP User Interface Library
Version: @GIMP_MAJOR_VERSION@.@GIMP_MINOR_VERSION@.@GIMP_MICRO_VERSION@
Requires: gimp-1.3 gtk+-2.0 >= 2.2.0
Libs: -L${libdir} -lgimpui-1.3 -lgimpwidgets-1.3
Cflags: -I${includedir}/gimp-1.3
Requires: gimp-2.0 gtk+-2.0 >= 2.2.0
Libs: -L${libdir} -lgimpui-@LT_RELEASE@ -lgimpwidgets-@LT_RELEASE@
Cflags: -I${includedir}/gimp-@LT_RELEASE@

6
gimpui.pc.in
View File

@ -6,6 +6,6 @@ includedir=@includedir@
Name: GIMP UI
Description: GIMP User Interface Library
Version: @GIMP_MAJOR_VERSION@.@GIMP_MINOR_VERSION@.@GIMP_MICRO_VERSION@
Requires: gimp-1.3 gtk+-2.0 >= 2.2.0
Libs: -L${libdir} -lgimpui-1.3 -lgimpwidgets-1.3
Cflags: -I${includedir}/gimp-1.3
Requires: gimp-2.0 gtk+-2.0 >= 2.2.0
Libs: -L${libdir} -lgimpui-@LT_RELEASE@ -lgimpwidgets-@LT_RELEASE@
Cflags: -I${includedir}/gimp-@LT_RELEASE@

4
m4macros/gimp-2.0.m4
View File

@ -12,8 +12,8 @@ dnl
AC_ARG_ENABLE(gimptest, [ --disable-gimptest do not try to compile and run a test GIMP program],, enable_gimptest=yes)
pkg_name=gimp-1.3
pkg_config_args="$pkg_name gimpui-1.3"
pkg_name=gimp-2.0
pkg_config_args="$pkg_name gimpui-2.0"
no_gimp=""