ryujinx-archive/GtkSharp
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: Fix Makefile of valtest and opaquetest samples

Browse source 
Some parts were not taking into account the fact that the generated code
is now in a subfolder.
This commit is contained in:
Bertrand Lorentz 2014-04-21 16:12:14 +02:00
parent e3b5fa22a4
commit 80485a464d
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sample/opaquetest/Makefile.am
View file

@ -4,7 +4,7 @@ lib_LTLIBRARIES = libopaque.la
assemblies=../../glib/glib-sharp.dll ../../gio/gio-sharp.dll ../../pango/pango-sharp.dll ../../atk/atk-sharp.dll ../../gdk/gdk-sharp.dll ../../gtk/gtk-sharp.dll assemblies=../../glib/glib-sharp.dll ../../gio/gio-sharp.dll ../../pango/pango-sharp.dll ../../atk/atk-sharp.dll ../../gdk/gdk-sharp.dll ../../gtk/gtk-sharp.dll
references=$(addprefix -r:, $(assemblies)) references=$(addprefix -r:, $(assemblies))
opaquetest.exe: OpaqueTest.cs generated/*.cs $(assemblies) opaquetest.exe: OpaqueTest.cs $(GENERATED_SOURCES) $(assemblies)
$(CSC) $(CSFLAGS) -out:opaquetest.exe $(references) $(srcdir)/OpaqueTest.cs $(GENERATED_SOURCES) $(CSC) $(CSFLAGS) -out:opaquetest.exe $(references) $(srcdir)/OpaqueTest.cs $(GENERATED_SOURCES)
libopaque_la_SOURCES = \ libopaque_la_SOURCES = \
@ -17,7 +17,7 @@ libopaque_la_LIBADD = $(GTK_LIBS)
AM_CPPFLAGS = $(GTK_CFLAGS) AM_CPPFLAGS = $(GTK_CFLAGS)
generated/*.cs: opaque-api.xml $(GENERATED_SOURCES): opaque-api.xml
$(RUNTIME) ../../generator/gapi_codegen.exe --generate $(srcdir)/opaque-api.xml \ $(RUNTIME) ../../generator/gapi_codegen.exe --generate $(srcdir)/opaque-api.xml \
--include=../../gtk/gtk-api.xml --include=../../gdk/gdk-api.xml \ --include=../../gtk/gtk-api.xml --include=../../gdk/gdk-api.xml \
--outdir=generated --assembly-name=opaque-sharp \ --outdir=generated --assembly-name=opaque-sharp \
@ -32,7 +32,7 @@ install:
CLEANFILES = \ CLEANFILES = \
opaquetest.exe \ opaquetest.exe \
opaquetest.exe.mdb \ opaquetest.exe.mdb \
generated/*.cs $(GENERATED_SOURCES)
EXTRA_DIST = \ EXTRA_DIST = \
OpaqueTest.cs \ OpaqueTest.cs \

6
sample/valtest/Makefile.am
View file

@ -10,7 +10,7 @@ else
VALOBJ=Gtksharp/Valobj.cs VALOBJ=Gtksharp/Valobj.cs
endif endif
valtest.exe: Valtest.cs Valobj.cs $(assemblies) valtest.exe: Valtest.cs $(VALOBJ) $(assemblies)
$(CSC) $(CSFLAGS) -out:valtest.exe $(references) $(srcdir)/Valtest.cs $(VALOBJ) $(CSC) $(CSFLAGS) -out:valtest.exe $(references) $(srcdir)/Valtest.cs $(VALOBJ)
libvalobj_la_SOURCES = \ libvalobj_la_SOURCES = \
@ -23,7 +23,7 @@ libvalobj_la_LIBADD = $(GTK_LIBS)
AM_CPPFLAGS = $(GTK_CFLAGS) AM_CPPFLAGS = $(GTK_CFLAGS)
Valobj.cs: valobj-api.xml $(VALOBJ): valobj-api.xml
$(RUNTIME) ../../generator/gapi_codegen.exe --generate $(srcdir)/valobj-api.xml \ $(RUNTIME) ../../generator/gapi_codegen.exe --generate $(srcdir)/valobj-api.xml \
--include=../../gtk/gtk-api.xml --include=../../gdk/gdk-api.xml \ --include=../../gtk/gtk-api.xml --include=../../gdk/gdk-api.xml \
--outdir=. --assembly-name=valobj-sharp \ --outdir=. --assembly-name=valobj-sharp \
@ -37,7 +37,7 @@ install:
CLEANFILES = \ CLEANFILES = \
valtest.exe \ valtest.exe \
valtest.exe.mdb \ valtest.exe.mdb \
Valobj.cs $(VALOBJ)
EXTRA_DIST = \ EXTRA_DIST = \
Valtest.cs \ Valtest.cs \