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=0167de27367ed60e1bd812c76f6d8b9cd38fdcc6;hb=5877eaa318ed3060f57621657c0888258da41a59;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd

diff --git a/cinelerra-5.1/guicast/Makefile b/cinelerra-5.1/guicast/Makefile
index 0167de27..50f5aa11 100644
--- a/cinelerra-5.1/guicast/Makefile
+++ b/cinelerra-5.1/guicast/Makefile
@@ -1,12 +1,5 @@
-include ../global_config
-
-CFLAGS += -I../quicktime
-
-# must only define here so applications using libpng don't see any of the XFT
-# includes at all.  They use a conflicting setjmp.
-ifeq ($(HAVE_XFT), y)
-CFLAGS += -DHAVE_XFT
-endif
+export TOPDIR ?= $(CURDIR)/..
+include $(TOPDIR)/global_config
 
 ifeq ($(OBJDIR), i686)
 BOOTSTRAPFLAGS := -DBOOTSTRAP="\"objcopy -B i386 -I binary -O elf32-i386\""
@@ -16,7 +9,6 @@ ifeq ($(OBJDIR), x86_64)
 BOOTSTRAPFLAGS := -DBOOTSTRAP="\"objcopy -B i386 -I binary -O elf64-x86-64\""
 endif
 
-
 $(shell mkdir -p $(OBJDIR) )
 
 OBJS = \
@@ -24,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 \
@@ -65,19 +58,18 @@ OBJS = \
 	$(OBJDIR)/bctheme.o \
 	$(OBJDIR)/bctitle.o \
 	$(OBJDIR)/bctoggle.o \
+	$(OBJDIR)/bctrace.o \
 	$(OBJDIR)/bctumble.o \
 	$(OBJDIR)/bcwindow.o \
 	$(OBJDIR)/bcwindow3d.o \
 	$(OBJDIR)/bcwindowbase.o \
 	$(OBJDIR)/bcwindowdraw.o \
 	$(OBJDIR)/bcwindowevents.o \
-	$(OBJDIR)/bcxfer.o \
 	$(OBJDIR)/condition.o \
 	$(OBJDIR)/errorbox.o \
 	$(OBJDIR)/filesystem.o \
 	$(OBJDIR)/mutex.o \
 	$(OBJDIR)/rotateframe.o \
-	$(OBJDIR)/sema.o \
 	$(OBJDIR)/thread.o \
 	$(OBJDIR)/testobject.o \
 	$(OBJDIR)/bctimer.o \
@@ -89,41 +81,23 @@ OBJS = \
 
 OUTPUT = $(OBJDIR)/libguicast.a
 
-TESTLIBS := \
-		$(OUTPUT) \
-		../quicktime/$(OBJDIR)/libquicktime.a \
-		$(LDFLAGS) \
-		$(GLLIBS) \
-		-lX11 \
-		-lXext \
-		-lXv \
-		-lpthread \
-		-lm \
-		-lpng
-
-ifeq ($(HAVE_XFT), y)
-TESTLIBS += -lXft
-endif	
-
-ifeq ($(HAVE_GL), y)
-TESTLIBS += -lGL -lGLU
-endif
-
 UTILS = $(OBJDIR)/bootstrap $(OBJDIR)/pngtoh $(OBJDIR)/pngtoraw
+BCXFER = xfer/$(OBJDIR)/xfer.stamp
+
+CFLAGS += -I/usr/include/freetype2
 
 $(shell echo $(CFLAGS) > $(OBJDIR)/c_flags)
 $(shell echo $(OBJS) > $(OBJDIR)/objs)
 
 all: $(OUTPUT) $(UTILS)
 
-$(OBJDIR)/bcxfer.o:	bcxfer.C xfer.C xfer.h
-	$(CXX) `cat $(OBJDIR)/c_flags` -c $< -o $@
-
-bcxfer.C:	bccmdl.py
-	python < ./bccmdl.py > bcxfer.C
+$(BCXFER):	bccmdl.py bcxfer.C bcxfer.h
+	python2.7 < ./bccmdl.py
+	+$(MAKE) -C xfer
 
-$(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
@@ -134,45 +108,19 @@ $(OBJDIR)/pngtoh: pngtoh.c
 $(OBJDIR)/pngtoraw: pngtoraw.c
 	gcc -O2 pngtoraw.c -o $(OBJDIR)/pngtoraw -lpng -lz
 
-replace:  replace.o $(OUTPUT)
-	$(CC) -o replace replace.o $(OUTPUT) \
-	../quicktime/i686/libquicktime.a \
-	$(LDFLAGS) $(XLIBS) -lpng
-
-#	$(XXF86VM) \
-
-
-
-test:	$(OBJDIR)/test.o $(STATICOUTPUT)
-	$(CC) -o $(OBJDIR)/test \
-		$(OBJDIR)/test.o \
-		$(TESTLIBS)
-
-test2:	$(OBJDIR)/test2.o $(STATICOUTPUT)
-	$(CC) -o $(OBJDIR)/test2 \
-		$(OBJDIR)/test2.o \
-		$(TESTLIBS)
-
-test3:	$(OBJDIR)/test3.o $(STATICOUTPUT)
-	$(CC) -o $(OBJDIR)/test3 \
-		$(OBJDIR)/test3.o \
-		$(TESTLIBS)
-
 clean:
 	rm -rf $(OBJDIR)
-	rm -f bcxfer.C
-	find \( -name core \
-		-o -name '*.o' -o -name '*.a' \
-		-o -name '*.so' \) -exec rm -f {} \;
+	$(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
-$(OBJDIR)/bccmodel_default.o:	      bccmodel_default.C  bccmodel_permutation.h
 
 val-%:
 	@echo $($(subst val-,,$@))