Commit Graph

29 Commits

Author SHA1 Message Date
Ell 5bcde32caf enums: run gimp-mkenums from the build dir
Commit 1e6acbd4e1 modified the
generated enum recipes to run gimp-mkenums from the source
directory, instead of the build directory, so that only the
basenames of the corresponding header files would appear in
the comment at the top of the generated files.  This was a
mistake -- $(GIMP_MKENUMS) is expecting to be invoked from the
build directory.

Switch back to running gimp-mkenums from the build directory.  To
avoid including the relative path from the build directory to the
source directory in the generated file, add a @basename@ production
variable to gimp-mkenums, which exapnds to the basename of the
input file, and use it instead of @filename@ in the recipes for the
generated enum files.
2017-05-22 20:29:18 -04:00
Ell f9fa0d1b18 enums: don't write generated enum files to src-dir if unchanged
When regenerating an enum file, don't copy it back to the source
directory if it hasn't actually changed.  This allows using a read-
only source directory where the enum header is newer than the
generated file, as long as they're not really out of sync.

OTOH, *do* touch the generated source-dir file even when unchanged,
in order to avoid re-running its recipe on the next build, however,
allow this to silently fail (which is harmless).
2017-05-22 17:58:04 -04:00
Ell 1e6acbd4e1 enums: generate enum files in source dir
We check them into git, so this makes it easier to keep them in
sync when using a separate build directory.

Case in point -- this commit also syncs a few enum files that went
out-of-sync with their headers.
2017-05-06 17:26:16 -04:00
Jehan 8a37c928eb app, plug-ins, libgimp*: clean out all remaining trailing spaces/tabs.
Rather than just discovering them by chance, a simple grep and some
search and replace are much more efficient! :-)
Cleaning only done on C and automake files.
2016-06-02 02:04:26 +02:00
Jehan 8c1cd7caac Makefile: fix VPATH builds for win32. 2014-09-14 18:28:26 +02:00
Michael Natterer 027e34230e libgimpthumb: add GIO_LIBS also to gimp_thumbnail_list_LDADD 2013-07-01 19:06:12 +02:00
Michael Natterer 66847b4cfd libgimpthumb: use GIO_CFLAGS/LIBS not GLIB_CFLAGS/LIBS 2013-06-29 18:11:07 +02:00
Michael Natterer ec786816bb */Makefile.am: merge INCLUDES into AM_CPPFLAGS
automake-1.13 finally warns about this anachronism.
2013-06-05 20:48:37 +02:00
Michael Natterer 9112d68488 Move gimpdir and thumbnails to proper places on OSX
gimpdir goes to ~/Library/Gimp/x.y
thumbnails go to ~/Library/Caches/org.freedesktop.thumbnails

The thumbnail location is not standardized yet, but is the only
location that makes sense. Also fix user install to search old
gimpdirs to migrate in both Library and the classic location.
Remove the obsolete CABON_CFLAGS from all makefiles.
2012-05-12 14:39:44 +02:00
Michael Natterer 486e76bdab libgimp*: use GIMP_API_VERSION in Makefile.am instead of hardcoding 2.0 2012-05-04 15:38:45 +02:00
Michael Natterer 056e09a6cb Remove the makefile.msc build system, it is unmaintained since 2008 2011-12-16 15:53:56 +01:00
Michael Natterer 844df2b4df libgimp*: add guards that #error out if individual files are included
This only helps to maintain proper includes in app/ and shouldn't
affect plug-ins at all, because these are supposed to only include the
main headers from libgimp/ since the beginning of time.

The gimpfootypes.h files do not have these guards, so we can continue
to maintain app/'s include policy that is very likely to error out if
wrong things are included.
2011-04-28 14:30:41 +02:00
Manish Singh 582cb0f14e Explicitly specify library dependencies at link time, so we can use gold. 2009-05-24 10:42:39 -07:00
Sven Neumann fe520925b7 app/base/Makefile.am app/core/Makefile.am app/display/Makefile.am
2008-11-03  Sven Neumann  <sven@gimp.org>

	
	* app/base/Makefile.am
	* app/core/Makefile.am
	* app/display/Makefile.am
	* app/paint/Makefile.am
	* app/plug-in/Makefile.am
	* app/text/Makefile.am
	* app/tools/Makefile.am
	* app/widgets/Makefile.am
	* libgimp/Makefile.am
	* libgimpbase/Makefile.am: 
	* libgimpconfig/Makefile.am
	* libgimpthumb/Makefile.am
	* libgimpwidgets/Makefile.am: micro-optimization in the 
generated
	enum registration code.

	* app/base/base-enums.c
	* app/core/core-enums.c
	* app/display/display-enums.c
	* app/paint/paint-enums.c
	* app/plug-in/plug-in-enums.c
	* app/text/text-enums.c
	* app/tools/tools-enums.c
	* app/widgets/widgets-enums.c
	* libgimpbase/gimpbaseenums.c
	* libgimpconfig/gimpcolorconfig-enums.c
	* libgimpwidgets/gimpwidgetsenums.c: regenerated.


svn path=/trunk/; revision=27538
2008-11-03 21:38:13 +00:00
Sven Neumann 8203e1ac50 use GCheckSum instead of the MD5 routine from libgimpmath.
2008-03-28  Sven Neumann  <sven@gimp.org>

	* libgimpthumb/gimpthumb-utils.c (gimp_thumb_png_name): use
	GCheckSum instead of the MD5 routine from libgimpmath.

	* gimpthumb.pc.in
	* libgimpthumb/Makefile.am: removed libgimpmath dependency from
	libgimpthumb.

svn path=/trunk/; revision=25287
2008-03-28 16:47:38 +00:00
Sven Neumann dc9ad3ee3d explicitly added GLIB_LIBS. Fixes bug #515566.
2008-02-11  Sven Neumann  <sven@gimp.org>

	* libgimpthumb/Makefile.am (libgimpthumb_2_0_la_LIBADD):
	explicitly added GLIB_LIBS. Fixes bug #515566.


svn path=/trunk/; revision=24855
2008-02-11 07:11:29 +00:00
Raphael Quinet c8ba6436b7 fixed typo: SURCES -> SOURCES.
2007-07-27  Raphael Quinet  <raphael@gimp.org>

	* libgimpthumb/Makefile.am (gimp_thumbnail_list_SOURCES): fixed
	typo: SURCES -> SOURCES.

svn path=/trunk/; revision=23042
2007-07-27 13:34:57 +00:00
Sven Neumann 09578ea070 removed extra check for gthread and fold it into the GLIB and GTK checks.
2007-06-25  Sven Neumann  <sven@gimp.org>

	* configure.in: removed extra check for gthread and fold it into
	the GLIB and GTK checks.

	* */Makefile.am: changed accordingly.

	* app/main.c (main): always call g_thread_init().

svn path=/trunk/; revision=22832
2007-06-25 12:41:59 +00:00
Sven Neumann 81bc301c4d fixed parallel builds (bug #447402).
2007-06-14  Sven Neumann  <sven@gimp.org>

	* libgimpthumb/Makefile.am (gimp_thumbnail_list_LDADD): fixed
	parallel builds (bug #447402).


svn path=/trunk/; revision=22776
2007-06-14 06:12:24 +00:00
Sven Neumann f322854007 app/text/Makefile.am app/core/Makefile.am app/tools/Makefile.am
2007-06-07  Sven Neumann  <sven@gimp.org>

	* app/text/Makefile.am
	* app/core/Makefile.am
	* app/tools/Makefile.am
	* app/display/Makefile.am
	* app/widgets/Makefile.am
	* app/base/Makefile.am
	* app/paint/Makefile.am
	* app/plug-in/Makefile.am
	* libgimp/Makefile.am
	* libgimpthumb/Makefile.am
	* tools/pdbgen/Makefile.am
	* libgimpwidgets/Makefile.am: applied the remaining parts of the
	patch from Daniel Richard G. to fix out-of-source-tree builds
	(bug #444960).

svn path=/trunk/; revision=22735
2007-06-07 13:19:44 +00:00
Michael Natterer 56eba3bd64 libgimpthumb/Makefile.am added my small thumbnail lister before it
2007-06-06  Michael Natterer  <mitch@gimp.org>

	* libgimpthumb/Makefile.am
	* libgimpthumb/gimp-thumbnail-list.c: added my small thumbnail
	lister before it bit-rots. It prints the filenames of thumbnails
	which match certain criteria. Use the output for further
	processing (e.g. deleting). Doesn't technically belong here but
	can't be added to tools/ because it depends on libgimpthumb.


svn path=/trunk/; revision=22716
2007-06-06 09:16:48 +00:00
Sven Neumann aed06d70ba s/GIMP_THREAD_FLAGS/GTHREAD_CFLAGS/
2005-02-13  Sven Neumann  <sven@gimp.org>

	* libgimp*/Makefile.am: s/GIMP_THREAD_FLAGS/GTHREAD_CFLAGS/
2005-02-13 15:52:44 +00:00
Michael Natterer ee42d8f506 added still unused flags type GimpDirtyMask.
2004-07-28  Michael Natterer  <mitch@gimp.org>

	* app/core/core-enums.h: added still unused flags type
	GimpDirtyMask.

	* app/base/Makefile.am
	* app/core/Makefile.am
	* app/display/Makefile.am
	* app/paint/Makefile.am
	* app/text/Makefile.am
	* app/tools/Makefile.am
	* app/widgets/Makefile.am
	* libgimpthumb/Makefile.am: changed calls to gimp-mkenums to
	support GTypeFlags and to make the value arrays private to the
	get_type() functions.

	* app/base/base-enums.c
	* app/core/core-enums.c
	* app/display/display-enums.c
	* app/paint/paint-enums.c
	* app/text/text-enums.c
	* app/tools/tools-enums.c
	* app/widgets/widgets-enums.c: regenerated.
2004-07-28 11:50:20 +00:00
Tor Lillqvist 6a4c2b144a For Win32, install gimpthumb.def, like the .def files of the other
2004-04-15  Tor Lillqvist  <tml@iki.fi>

	* libgimpthumb/Makefile.am: For Win32, install gimpthumb.def, like
	the .def files of the other libgimp* libs.

	* app/Makefile.am (INCLUDES): Add PANGOFT2_CFLAGS.

	* gimp-zip.in: Put also libgimpthumb in the developer package.
2004-04-15 21:09:23 +00:00
Sven Neumann f97ae7d726 set version number to 2.0.0, version string to "2.0rc1".
2004-03-20  Sven Neumann  <sven@gimp.org>

	* configure.in: set version number to 2.0.0, version string to
	"2.0rc1".

	* app/Makefile.am
	* libgimp/Makefile.am
	* libgimpbase/Makefile.am
	* libgimpcolor/Makefile.am
	* libgimpmath/Makefile.am
	* libgimpmodule/Makefile.am
	* libgimpthumb/Makefile.am
	* libgimpwidgets/Makefile.am
	* tools/Makefile.am: changed 1.3 to 2.0 all over the place.

	* README
	* NEWS: updated for the 2.0rc1 release.
2004-03-20 20:45:17 +00:00
Manish Singh 9db6153f09 modernized, made a lot of things m4 macros, and made versioning a lot more
2004-01-21  Manish Singh  <yosh@gimp.org>

        * configure.in: modernized, made a lot of things m4 macros, and made
        versioning a lot more finegrained, in anticipation for post-2.0.

        * autogen.sh: bumped up libtool and glib minimum requirements to match
        reality.

        * gimp-2.0.pc.in
        * gimpthumb-2.0.pc.in
        * gimpui-2.0.pc.in: adapted to new versioning variables, and bring
        in RT_LIBS when needed.

        * */*/Makefile.am: adapted to new versioning variables.
2004-01-22 03:51:46 +00:00
Sven Neumann 4e2d3f61f9 libgimpthumb/Makefile.am added new files that define the GIMP_THUMB_ERROR
2003-12-02  Sven Neumann  <sven@gimp.org>

	* libgimpthumb/Makefile.am
	* libgimpthumb/gimpthumb-error.[ch]: added new files that define the
	GIMP_THUMB_ERROR domain.

	* libgimpthumb/gimpthumb-utils.[ch]
	* libgimpthumb/gimpthumb.h
	* libgimpthumb/gimpthumbnail.[ch]: finalizing the API.
2003-12-02 02:06:20 +00:00
Sven Neumann e76a587d7e libgimpthumb/Makefile.am libgimpthumb/gimpthumb-enums.h
2003-11-26  Sven Neumann  <sven@gimp.org>

	* libgimpthumb/Makefile.am
	* libgimpthumb/gimpthumb-enums.h
	* libgimpthumb/gimpthumb-utils.[ch]
	* libgimpthumb/gimpthumbnail.[ch]: more changes, still unfinished.
2003-11-26 16:49:53 +00:00
Sven Neumann d3a8ec0c01 configure.in gimpthumb-1.3.pc.in libgimpthumb/Makefile.am
2003-11-26  Sven Neumann  <sven@gimp.org>

	* Makefile.am:
	* configure.in
	* gimpthumb-1.3.pc.in
	* libgimpthumb/Makefile.am
	* libgimpthumb/gimpthumb-enums.h
	* libgimpthumb/gimpthumb-types.h
	* libgimpthumb/gimpthumb.def
	* libgimpthumb/gimpthumb.h
	* libgimpthumb/gimpthumb-utils.[ch]
	* libgimpthumb/gimpthumbnail.[ch]: added a first draft of
	libgimpthumb. The API isn't final and the implementation is
	incomplete. It compiles but don't attempt to use it yet.
2003-11-26 01:12:36 +00:00