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

libgimp/Makefile.am libgimpcolor/Makefile.am libgimpmath/Makefile.am

Browse Source 
2002-05-14  Sven Neumann  <sven@gimp.org>

	* libgimp/Makefile.am
	* libgimpcolor/Makefile.am
	* libgimpmath/Makefile.am
	* libgimptool/Makefile.am
	* libgimpwidgets/Makefile.am: removed unneeded CPPFLAGS.

	* libgimpproxy/Makefile.am: ditto. Changed rules for generated files
	so that they work for parallel builds.
This commit is contained in:
Sven Neumann
2002-05-14 15:13:14 +00:00
committed by Sven Neumann
parent c347f14848
commit 1eedb95e3e
7 changed files with 35 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2002-05-14 Sven Neumann <sven@gimp.org>
* libgimp/Makefile.am
* libgimpcolor/Makefile.am
* libgimpmath/Makefile.am
* libgimptool/Makefile.am
* libgimpwidgets/Makefile.am: removed unneeded CPPFLAGS.
* libgimpproxy/Makefile.am: ditto. Changed rules for generated files
so that they work for parallel builds.
2002-05-14 Sven Neumann <sven@gimp.org> 2002-05-14 Sven Neumann <sven@gimp.org>
* app/config/gimpconfig.c: fixed error messages. * app/config/gimpconfig.c: fixed error messages.

3
libgimp/Makefile.am
View File

@ -3,9 +3,6 @@
gimpincludedir = $(includedir)/gimp-$(LT_RELEASE)/libgimp gimpincludedir = $(includedir)/gimp-$(LT_RELEASE)/libgimp
AM_CPPFLAGS = @STRIP_BEGIN@ \ AM_CPPFLAGS = @STRIP_BEGIN@ \
-DGIMPDIR=\""$(gimpdir)"\" \
-DDATADIR=\""$(gimpdatadir)"\" \
-DSYSCONFDIR=\""$(gimpsysconfdir)"\" \
-DG_LOG_DOMAIN=\"LibGimp\" \ -DG_LOG_DOMAIN=\"LibGimp\" \
@GIMP_THREAD_FLAGS@ \ @GIMP_THREAD_FLAGS@ \
@STRIP_END@ @STRIP_END@

3
libgimpcolor/Makefile.am
View File

@ -43,9 +43,6 @@ endif
libgimpcolorincludedir = $(includedir)/gimp-$(LT_RELEASE)/libgimpcolor libgimpcolorincludedir = $(includedir)/gimp-$(LT_RELEASE)/libgimpcolor
AM_CPPFLAGS = @STRIP_BEGIN@ \ AM_CPPFLAGS = @STRIP_BEGIN@ \
-DGIMPDIR=\""$(gimpdir)"\" \
-DDATADIR=\""$(gimpdatadir)"\" \
-DSYSCONFDIR=\""$(gimpsysconfdir)"\" \
-DG_LOG_DOMAIN=\"LibGimpColor\" \ -DG_LOG_DOMAIN=\"LibGimpColor\" \
@GIMP_THREAD_FLAGS@ \ @GIMP_THREAD_FLAGS@ \
@STRIP_END@ @STRIP_END@

3
libgimpmath/Makefile.am
View File

@ -43,9 +43,6 @@ endif
libgimpmathincludedir = $(includedir)/gimp-$(LT_RELEASE)/libgimpmath libgimpmathincludedir = $(includedir)/gimp-$(LT_RELEASE)/libgimpmath
AM_CPPFLAGS = @STRIP_BEGIN@ \ AM_CPPFLAGS = @STRIP_BEGIN@ \
-DGIMPDIR=\""$(gimpdir)"\" \
-DDATADIR=\""$(gimpdatadir)"\" \
-DSYSCONFDIR=\""$(gimpsysconfdir)"\" \
-DG_LOG_DOMAIN=\"LibGimpMath\" \ -DG_LOG_DOMAIN=\"LibGimpMath\" \
@GIMP_THREAD_FLAGS@ \ @GIMP_THREAD_FLAGS@ \
@STRIP_END@ @STRIP_END@

29
libgimpproxy/Makefile.am
View File

@ -3,9 +3,6 @@
libgimpproxyincludedir = $(includedir)/gimp-$(LT_RELEASE)/libgimpproxy libgimpproxyincludedir = $(includedir)/gimp-$(LT_RELEASE)/libgimpproxy
AM_CPPFLAGS = @STRIP_BEGIN@ \ AM_CPPFLAGS = @STRIP_BEGIN@ \
-DGIMPDIR=\""$(gimpdir)"\" \
-DDATADIR=\""$(gimpdatadir)"\" \
-DSYSCONFDIR=\""$(gimpsysconfdir)"\" \
-DG_LOG_DOMAIN=\"LibGimpProxy\" \ -DG_LOG_DOMAIN=\"LibGimpProxy\" \
@GIMP_THREAD_FLAGS@ \ @GIMP_THREAD_FLAGS@ \
@STRIP_END@ @STRIP_END@
@ -52,29 +49,29 @@ libgimpproxy_1_3_la_LIBADD = $(GLIB_LIBS)
# rules to generate built sources # rules to generate built sources
# #
# setup autogeneration dependancies # setup autogeneration dependancies
gen_sources = xgen-tec gen_sources = xgen-goh xgen-goc xgen-gch xgen-gph
CLEANFILES = $(gen_sources) CLEANFILES = $(gen_sources)
$(srcdir)/gimpobject.h: $(srcdir)/../app/core/gimpobject.h $(GIMP_MKPROXY) $(srcdir)/gimpobject.h: $(srcdir)/../app/core/gimpobject.h $(GIMP_MKPROXY)
$(GIMP_MKPROXY) \ $(GIMP_MKPROXY) \
--fprod "\n/* autogenerated from \"@filename@\" */" \ --fprod "\n/* autogenerated from \"@filename@\" */" \
$(srcdir)/../app/core/gimpobject.h > xgen-tec \ $(srcdir)/../app/core/gimpobject.h > xgen-goh \
&& cp xgen-tec $(@F) \ && cp xgen-goh $(@F) \
&& rm -f xgen-tec && rm -f xgen-goh
$(srcdir)/gimpobject.c: $(srcdir)/../app/core/gimpobject.c $(GIMP_MKPROXY) $(srcdir)/gimpobject.c: $(srcdir)/../app/core/gimpobject.c $(GIMP_MKPROXY)
$(GIMP_MKPROXY) \ $(GIMP_MKPROXY) \
--fprod "\n/* autogenerated from \"@filename@\" */" \ --fprod "\n/* autogenerated from \"@filename@\" */" \
$(srcdir)/../app/core/gimpobject.c > xgen-tec \ $(srcdir)/../app/core/gimpobject.c > xgen-goc \
&& cp xgen-tec $(@F) \ && cp xgen-goc $(@F) \
&& rm -f xgen-tec && rm -f xgen-goc
$(srcdir)/gimpchannel.h: $(srcdir)/../app/core/gimpchannel.h $(GIMP_MKPROXY) $(srcdir)/gimpchannel.h: $(srcdir)/../app/core/gimpchannel.h $(GIMP_MKPROXY)
$(GIMP_MKPROXY) \ $(GIMP_MKPROXY) \
--fprod "\n/* autogenerated from \"@filename@\" */" \ --fprod "\n/* autogenerated from \"@filename@\" */" \
$(srcdir)/../app/core/gimpchannel.h > xgen-tec \ $(srcdir)/../app/core/gimpchannel.h > xgen-gch \
&& cp xgen-tec $(@F) \ && cp xgen-gch $(@F) \
&& rm -f xgen-tec && rm -f xgen-gch
$(srcdir)/gimpproxytypes.h: $(srcdir)/../app/core/core-types.h $(srcdir)/../app/core/core-enums.h $(srcdir)/../app/widgets/widgets-enums.h $(srcdir)/../app/display/display-types.h $(GIMP_MKPROXY) $(srcdir)/gimpproxytypes.h: $(srcdir)/../app/core/core-types.h $(srcdir)/../app/core/core-enums.h $(srcdir)/../app/widgets/widgets-enums.h $(srcdir)/../app/display/display-types.h $(GIMP_MKPROXY)
@ -86,7 +83,7 @@ $(srcdir)/gimpproxytypes.h: $(srcdir)/../app/core/core-types.h $(srcdir)/../app/
$(srcdir)/../app/core/core-types.h \ $(srcdir)/../app/core/core-types.h \
$(srcdir)/../app/widgets/widgets-enums.h \ $(srcdir)/../app/widgets/widgets-enums.h \
$(srcdir)/../app/display/display-types.h \ $(srcdir)/../app/display/display-types.h \
> xgen-tec \ > xgen-gph \
&& cp xgen-tec $(@F) \ && cp xgen-gph $(@F) \
&& rm -f xgen-tec && rm -f xgen-gph

6
libgimptool/Makefile.am
View File

@ -3,9 +3,6 @@
libgimptoolincludedir = $(includedir)/gimp-$(LT_RELEASE)/libgimptool libgimptoolincludedir = $(includedir)/gimp-$(LT_RELEASE)/libgimptool
AM_CPPFLAGS = @STRIP_BEGIN@ \ AM_CPPFLAGS = @STRIP_BEGIN@ \
-DGIMPDIR=\""$(gimpdir)"\" \
-DDATADIR=\""$(gimpdatadir)"\" \
-DSYSCONFDIR=\""$(gimpsysconfdir)"\" \
-DG_LOG_DOMAIN=\"LibGimpTool\" \ -DG_LOG_DOMAIN=\"LibGimpTool\" \
@GIMP_THREAD_FLAGS@ \ @GIMP_THREAD_FLAGS@ \
@STRIP_END@ @STRIP_END@
@ -65,6 +62,3 @@ $(srcdir)/gimptoolenums.c: $(srcdir)/gimptoolenums.h $(GIMP_MKENUMS)
$(srcdir)/gimptoolenums.h > xgen-tec \ $(srcdir)/gimptoolenums.h > xgen-tec \
&& cp xgen-tec $(@F) \ && cp xgen-tec $(@F) \
&& rm -f xgen-tec && rm -f xgen-tec

3
libgimpwidgets/Makefile.am
View File

@ -3,9 +3,6 @@
libgimpwidgetsincludedir = $(includedir)/gimp-$(LT_RELEASE)/libgimpwidgets libgimpwidgetsincludedir = $(includedir)/gimp-$(LT_RELEASE)/libgimpwidgets
AM_CPPFLAGS = @STRIP_BEGIN@ \ AM_CPPFLAGS = @STRIP_BEGIN@ \
-DGIMPDIR=\""$(gimpdir)"\" \
-DDATADIR=\""$(gimpdatadir)"\" \
-DSYSCONFDIR=\""$(gimpsysconfdir)"\" \
-DG_LOG_DOMAIN=\"LibGimpWidgets\" \ -DG_LOG_DOMAIN=\"LibGimpWidgets\" \
@GIMP_THREAD_FLAGS@ \ @GIMP_THREAD_FLAGS@ \
@STRIP_END@ @STRIP_END@