X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2FMakefile;h=50f5aa11e5ae626001e30262d674927333b32815;hp=52090e20f4d80b7abf9bfde318bf5d550d8b12b2;hb=5877eaa318ed3060f57621657c0888258da41a59;hpb=0ac6a1397cf8ee19cf75f3fe893c27e9f4fc0ea5

diff --git a/cinelerra-5.1/guicast/Makefile b/cinelerra-5.1/guicast/Makefile
index 52090e20..50f5aa11 100644
--- a/cinelerra-5.1/guicast/Makefile
+++ b/cinelerra-5.1/guicast/Makefile
@@ -65,7 +65,6 @@ OBJS = \
 	$(OBJDIR)/bcwindowbase.o \
 	$(OBJDIR)/bcwindowdraw.o \
 	$(OBJDIR)/bcwindowevents.o \
-	$(OBJDIR)/bcxfer.o \
 	$(OBJDIR)/condition.o \
 	$(OBJDIR)/errorbox.o \
 	$(OBJDIR)/filesystem.o \
@@ -83,6 +82,7 @@ OBJS = \
 OUTPUT = $(OBJDIR)/libguicast.a
 
 UTILS = $(OBJDIR)/bootstrap $(OBJDIR)/pngtoh $(OBJDIR)/pngtoraw
+BCXFER = xfer/$(OBJDIR)/xfer.stamp
 
 CFLAGS += -I/usr/include/freetype2
 
@@ -91,14 +91,13 @@ $(shell echo $(OBJS) > $(OBJDIR)/objs)
 
 all: $(OUTPUT) $(UTILS)
 
-$(OBJDIR)/bcxfer.o:	bcxfer.C xfer.C xfer.h
-	$(CXX) `cat $(OBJDIR)/c_flags` -O3 -c $< -o $@
+$(BCXFER):	bccmdl.py bcxfer.C bcxfer.h
+	python2.7 < ./bccmdl.py
+	+$(MAKE) -C xfer
 
-bcxfer.C:	bccmdl.py
-	python2.7 < ./bccmdl.py > bcxfer.C
-
-$(OUTPUT): $(OBJS)
-	ar rcs $(OUTPUT) `cat $(OBJDIR)/objs`
+$(OUTPUT): $(OBJS) $(BCXFER)
+	ar rc $(OUTPUT) `cat $(OBJDIR)/objs` `ls -1 $(dir $(BCXFER))/xfer*.o`
+	ar rs $(OUTPUT) `ls -1 $(dir $(BCXFER))/xfer*.o`
 
 $(OBJDIR)/bootstrap:
 	gcc -O2 $(BOOTSTRAPFLAGS) bootstrap.c -o $(OBJDIR)/bootstrap
@@ -111,14 +110,14 @@ $(OBJDIR)/pngtoraw: pngtoraw.c
 
 clean:
 	rm -rf $(OBJDIR)
-	rm -f bcxfer.C
+	$(MAKE) -C xfer clean
 
 install:
 
 $(LIBOBJS) $(OBJS) $(CUTOBJ):
 
 $(OBJDIR)/%.o:          %.C
-	$(CXX) `cat $(OBJDIR)/c_flags` '-DMSGQUAL="$*"' -c $< -o $@
+	$(CXX) `cat $(OBJDIR)/c_flags` -DMSGQUAL=$* -c $< -o $@
 
 $(OBJDIR)/bootstrap: bootstrap.c
 $(OBJDIR)/pngtoh: pngtoh.c