2002-12-11 Juli Mallett <jmallett@FreeBSD.org>

* gconf/Makefile.in, sample/Makefile.in: Use $(MAKE) not "make."
	* parser/Makefile.in: Use CFLAGS and CPPFLAGS hints from configure,
	and the base dependency CFLAGS.  Fixes case where iconv.h is outside
	of the compiler's default path.

svn path=/trunk/gtk-sharp/; revision=9578
This commit is contained in:
Juli Mallett 2002-12-11 23:10:31 +00:00
parent 7a56c28286
commit eca30c3078
4 changed files with 17 additions and 7 deletions

View File

@ -1,3 +1,10 @@
2002-12-11 Juli Mallett <jmallett@FreeBSD.org>
* gconf/Makefile.in, sample/Makefile.in: Use $(MAKE) not "make."
* parser/Makefile.in: Use CFLAGS and CPPFLAGS hints from configure,
and the base dependency CFLAGS. Fixes case where iconv.h is outside
of the compiler's default path.
2002-12-10 Mike Kestner <mkestner@speakeasy.net>
* released 0.6.

View File

@ -5,15 +5,15 @@ SUBDIRS = GConf GConf.PropertyEditors tools
linux:
for i in $(SUBDIRS); do \
make -C $$i || exit 1; \
$(MAKE) -C $$i || exit 1; \
done
install: all
for i in $(SUBDIRS); do \
make -C $$i install || exit 1; \
$(MAKE) -C $$i install || exit 1; \
done
clean:
for i in $(SUBDIRS); do \
make -C $$i clean || exit 1; \
$(MAKE) -C $$i clean || exit 1; \
done

View File

@ -1,4 +1,7 @@
CC = @CC@
CFLAGS = @CFLAGS@
CPPFLAGS = @CPPFLAGS@
BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
SCRIPTS = \
gapi.pl \
@ -10,7 +13,7 @@ MODULES=GAPI/Metadata.pm
all: $(SCRIPTS) $(MODULES) gapi_format_xml
gapi_format_xml: formatXml.c
$(CC) -o gapi_format_xml formatXml.c `pkg-config --cflags --libs libxml-2.0 glib-2.0`
$(CC) $(CPPFLAGS) -o gapi_format_xml formatXml.c `pkg-config --cflags --libs libxml-2.0 glib-2.0` $(CFLAGS) $(BASE_DEPENDENCIES_CFLAGS)
clean:
rm -f gapi_format_xml

View File

@ -19,7 +19,7 @@ windows:
$(CSC) /unsafe /out:button.exe /r:../glib/glib-sharp.dll /r:../gtk/gtk-sharp.dll ButtonApp.cs
linux: gtk-hello-world.exe button.exe menu.exe size.exe scribble.exe treeviewdemo.exe $(GNOME_TARGETS) $(GLADE_TARGETS)
@ENABLE_GNOME_TRUE@ make -C gconf
@ENABLE_GNOME_TRUE@ $(MAKE) -C gconf
gtk-hello-world.exe: HelloWorld.cs
$(MCS) --unsafe -o gtk-hello-world.exe $(local_paths) $(all_assemblies) HelloWorld.cs
@ -56,11 +56,11 @@ glade-test.exe: GladeTest.cs test.glade
clean:
rm -f *.exe
@ENABLE_GNOME_TRUE@ make -C gconf clean
@ENABLE_GNOME_TRUE@ $(MAKE) -C gconf clean
unix:
@echo "'make unix' is broken for now."
install: linux
@ENABLE_GNOME_TRUE@ make -C gconf install
@ENABLE_GNOME_TRUE@ $(MAKE) -C gconf install