Permalink
Browse files

fix generated build files

  • Loading branch information...
1 parent b1557c8 commit b44f137eea0cbe4387f1d427908a3105524e03ab @shana committed Feb 1, 2013
Showing with 27 additions and 18 deletions.
  1. +15 −15 bindinate/Makefile.am.template
  2. +12 −3 bindinate/bindinate.in
@@ -1,28 +1,28 @@
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = $(ASSEMBLY_PC).pc
+RAW_API = $(ASSEMBLY_NAME)-api.raw
+API = $(ASSEMBLY_NAME)-api.xml
+METADATA = $(ASSEMBLY_NAME).metadata
+DLL = $(top_srcdir)/out/$(ASSEMBLY_NAME).dll
+DLLMAP = $(top_srcdir)/out/$(ASSEMBLY_NAME).dll.config
-RAW_API=sources/$(ASSEMBLY_NAME)-api.raw
-API=sources/$(ASSEMBLY_NAME)-api.xml
-METADATA=sources/$(ASSEMBLY_NAME).metadata
-DLL=out/$(ASSEMBLY_NAME).dll
-DLLMAP=out/$(ASSEMBLY_NAME).dll.config
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = $(PCFILE)
sources =
-build_sources = sources/AssemblyInfo.cs $(sources)
+build_sources = AssemblyInfo.cs $(sources)
CLEANFILES = $(DLL) generated-stamp generated/*.cs $(API)
-DISTCLEANFILES= sources/AssemblyInfo.cs $(ASSEMBLY_PC).pc $(DLLMAP)
+DISTCLEANFILES = AssemblyInfo.cs $(DLLMAP)
noinst_DATA = $(DLL)
-EXTRA_DIST = $(RAW_API) $(sources) $(METADATA) \
- sources/AssemblyInfo.cs.in \
- sources/$(ASSEMBLY_NAME).dll.config.in \
- sources/$(ASSEMBLY_NAME)-sources.xml \
- sources/$(ASSEMBLY_NAME).snk \
- $(ASSEMBLY_NAME).pc.in
+EXTRA_DIST = \
+ $(RAW_API) \
+ $(sources) \
+ $(METADATA) \
+ AssemblyInfo.cs.in \
+ $(ASSEMBLY_NAME).snk
all: generated-stamp $(ASSEMBLY)
View
@@ -136,6 +136,7 @@ cat >>$OUTDIR/$CONFIGURE <<EOF
AC_CONFIG_FILES([
Makefile
+ sources/Makefile
sources/AssemblyInfo.cs
$NAME-sharp-$VERSION.pc
doc/Makefile
@@ -153,7 +154,15 @@ echo " * Documentation: $enable_monodoc (\$MONODOC)"
echo ""
EOF
-sed "s/#REFERENCES#/$REF/g" @prefix@/lib/bindinator/Makefile.am.template>$OUTDIR/Makefile.am
+cat >>$OUTDIR/Makefile.am <<EOF
+SUBDIRS = sources doc
+
+EXTRA_DIST = $NAME-sharp-$VERSION.pc.in
+DISTCLEANFILES = $NAME-sharp-$VERSION.pc
+
+EOF
+
+sed "s/#REFERENCES#/$REF/g" @prefix@/lib/bindinator/Makefile.am.template>$OUTDIR/sources/Makefile.am
#cp @prefix@/lib/bindinator/Makefile.am.template $OUTDIR/Makefile.am
cp @prefix@/lib/bindinator/AssemblyInfo.cs.in $OUTDIR/sources/.
cp @prefix@/lib/bindinator/autogen.sh $OUTDIR/.
@@ -170,8 +179,8 @@ if [ ! -e "$OUTDIR/AUTHORS" ]; then touch $OUTDIR/AUTHORS; fi
if [ ! -e "$OUTDIR/ChangeLog" ]; then touch $OUTDIR/ChangeLog; fi
if [ ! -e "$OUTDIR/COPYING" ]; then touch $OUTDIR/COPYING; fi
-if [ ! -e $OUTDIR/NAME-sharp.snk ]; then
- sn -k $OUTDIR/$NAME-sharp.snk
+if [ ! -e $OUTDIR/sources/NAME-sharp.snk ]; then
+ sn -k $OUTDIR/sources/$NAME-sharp.snk
fi
if [ ! -x $OUTDIR/$NAME-sharp-$VERSION.pc.in ]; then

0 comments on commit b44f137

Please sign in to comment.