sams icons, bsd fixups, lv2 deps

[goodguy/history.git] / cinelerra-5.1 / guicast / Makefile

diff --git a/cinelerra-5.1/guicast/Makefile b/cinelerra-5.1/guicast/Makefile
index efc7f15c1bbc6e06861b7a42b1808b1c2a7ef358..50f5aa11e5ae626001e30262d674927333b32815 100644 (file)
--- a/cinelerra-5.1/guicast/Makefile
+++ b/cinelerra-5.1/guicast/Makefile
@@ -16,6 +16,7 @@ OBJS = \
        $(OBJDIR)/bcbitmap.o \
        $(OBJDIR)/bcbutton.o \
        $(OBJDIR)/bccapture.o \
+       $(OBJDIR)/bccolors.o \
        $(OBJDIR)/bccmodels.o \
        $(OBJDIR)/bccounter.o \
        $(OBJDIR)/bcclipboard.o \
@@ -64,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 \
@@ -82,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
 
@@ -90,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
@@ -110,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` -c $< -o $@
+       $(CXX) `cat $(OBJDIR)/c_flags` -DMSGQUAL=$* -c $< -o $@
 
 $(OBJDIR)/bootstrap: bootstrap.c
 $(OBJDIR)/pngtoh: pngtoh.c