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

removed hack for gimp-console compilation. automake seems to handle it

Browse Source 
2004-07-13  Sven Neumann  <sven@gimp.org>

	* app/Makefile.am: removed hack for gimp-console compilation.
	automake seems to handle it correctly all by itself.
This commit is contained in:
Sven Neumann
2004-07-12 22:34:37 +00:00
committed by Sven Neumann
parent d2b7bdc735
commit 1e7a0f341d
3 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2004-07-13 Sven Neumann <sven@gimp.org>
* app/Makefile.am: removed hack for gimp-console compilation.
automake seems to handle it correctly all by itself.
2004-07-12 Michael Schumacher <schumaml@cvs.gnome.org> 2004-07-12 Michael Schumacher <schumaml@cvs.gnome.org>
* app/app_procs.c: added * app/app_procs.c: added

1
app/.cvsignore
View File

@ -5,4 +5,3 @@ makefile.mingw
.libs .libs
gimp-2.1 gimp-2.1
gimp-console-2.1 gimp-console-2.1
app_procs_console.c

21
app/Makefile.am
View File

@ -35,7 +35,8 @@ else
bin_PROGRAMS = gimp-2.1 bin_PROGRAMS = gimp-2.1
endif endif
COMMON_SOURCES = \ app_sources = \
app_procs.c \
app_procs.h \ app_procs.h \
main.c \ main.c \
batch.c \ batch.c \
@ -48,17 +49,14 @@ COMMON_SOURCES = \
units.h \ units.h \
gimp-intl.h gimp-intl.h
gimp_2_1_SOURCES = \ gimp_2_1_SOURCES = $(app_sources)
$(COMMON_SOURCES) \
app_procs.c
EXTRA_DIST = \ EXTRA_DIST = \
makefile.msc \ makefile.msc \
gimp.rc \ gimp.rc \
wilber.ico wilber.ico
CLEANFILES = \
app_procs_console.c
if HAVE_GLIBC_REGEX if HAVE_GLIBC_REGEX
REGEXREPL = REGEXREPL =
@ -138,13 +136,10 @@ gimp_2_1_LDADD = \
$(INTLLIBS) \ $(INTLLIBS) \
$(REGEXREPL) $(REGEXREPL)
if ENABLE_GIMP_CONSOLE
app_procs_console.c: $(srcdir)/app_procs.c
cp -f $(srcdir)/app_procs.c app_procs_console.c
gimp_console_2_1_SOURCES = \ if ENABLE_GIMP_CONSOLE
$(COMMON_SOURCES) \
app_procs_console.c gimp_console_2_1_SOURCES = $(app_sources)
gimp_console_2_1_CPPFLAGS = \ gimp_console_2_1_CPPFLAGS = \
$(AM_CPPFLAGS) \ $(AM_CPPFLAGS) \
@ -183,8 +178,10 @@ gimp_console_2_1_LDADD = \
$(RT_LIBS) \ $(RT_LIBS) \
$(INTLLIBS) \ $(INTLLIBS) \
$(REGEXREPL) $(REGEXREPL)
endif endif
install-exec-hook: install-exec-hook:
if DEFAULT_BINARY if DEFAULT_BINARY
cd $(DESTDIR)$(bindir) \ cd $(DESTDIR)$(bindir) \