beagle r4622 - trunk/beagle/BeagleClient



Author: dbera
Date: Thu Mar 20 21:43:52 2008
New Revision: 4622
URL: http://svn.gnome.org/viewvc/beagle?rev=4622&view=rev

Log:
Oops - missed this.


Modified:
   trunk/beagle/BeagleClient/Makefile.am

Modified: trunk/beagle/BeagleClient/Makefile.am
==============================================================================
--- trunk/beagle/BeagleClient/Makefile.am	(original)
+++ trunk/beagle/BeagleClient/Makefile.am	Thu Mar 20 21:43:52 2008
@@ -10,10 +10,8 @@
 CSFLAGS += -define:ENABLE_AVAHI
 endif
 
-CSFILES = 						\
-	$(srcdir)/AssemblyInfo.cs			\
+SERIALIZER_CSFILES = 					\
 	$(srcdir)/Hit.cs                		\
-	$(srcdir)/IIndexableGenerator.cs       		\
 	$(srcdir)/Indexable.cs          		\
 	$(srcdir)/IndexingService.cs			\
 	$(srcdir)/IndexingStatusResponse.cs		\
@@ -26,10 +24,17 @@
 	$(srcdir)/QueryableStatus.cs			\
 	$(srcdir)/RemoteControl.cs			\
 	$(srcdir)/Snippet.cs				\
-	$(srcdir)/Transport.cs				\
-	$(srcdir)/UnixTransport.cs			\
 	$(srcdir)/Versioned.cs
 
+OTHER_CSFILES =	\
+	$(srcdir)/AssemblyInfo.cs			\
+	$(srcdir)/IIndexableGenerator.cs       		\
+	$(srcdir)/Transport.cs				\
+	$(srcdir)/UnixTransport.cs
+
+CSFILES = $(SERIALIZER_CSFILES)	\
+	  $(OTHER_CSFILES)
+
 LOCAL_ASSEMBLIES =					\
 	../Util/Util.dll
 
@@ -41,8 +46,18 @@
 
 RESOURCES =
 
-$(TARGET): $(CSFILES) $(LOCAL_ASSEMBLIES) $(RESOURCES)
-	$(CSC) -out:$@ $(CSFLAGS) $(CSFILES) $(ASSEMBLIES) $(RESOURCES)
+DUMMY_TARGET = Beagle.Dummy.dll
+GENERATED_DIR = generated
+GENERATED_TARGET = $(GENERATED_DIR)/$(DUMMY_TARGET:%.dll=%.XmlSerializers.dll)
+
+$(DUMMY_TARGET): $(CSFILES) $(LOCAL_ASSEMBLIES) $(RESOURCES)
+	$(CSC) -out:$@ $(CSFLAGS) -define:GENERATE_SERIALIZE $(CSFILES) $(ASSEMBLIES) $(RESOURCES)
+
+$(GENERATED_TARGET): $(SERIALIZER_CSFILES) $(DUMMY_TARGET)
+	DUMMY_TARGET="$(DUMMY_TARGET)" $(MAKE) -e -C $(GENERATED_DIR)
+
+$(TARGET): $(CSFILES) $(LOCAL_ASSEMBLIES) $(RESOURCES) $(GENERATED_TARGET)
+	$(CSC) -out:$@ $(CSFLAGS) $(CSFILES) $(ASSEMBLIES) $(RESOURCES) $(GENERATED_DIR)/*.cs
 
 all: $(TARGET)
 
@@ -56,6 +71,10 @@
 EXTRA_DIST =		\
 	$(CSFILES)
 
-CLEANFILES =		\
-	$(TARGET)	\
+CLEANFILES =			\
+	$(DUMMY_TARGET)		\
+	$(DUMMY_TARGET).mdb 	\
+	$(GENERATED_TARGET)	\
+	$(GENERATED_TARGET).mdb	\
+	$(TARGET)		\
 	$(TARGET).mdb



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]