Split the bigscreen objects in the Makefile into slightly more manageable groups.

[ccbs] / bigscreen / Makefile

diff --git a/bigscreen/Makefile b/bigscreen/Makefile
index 07201d5cee973a266b0e8c57ba10e1ca519054db..33e8478f1221f38711a9b4eb2d28b43497184d68 100644 (file)
--- a/bigscreen/Makefile
+++ b/bigscreen/Makefile
@@ -1,17 +1,28 @@
 CC=gcc
 CXX=g++
-CPPFLAGS=-I/usr/include/postgresql $(shell freetype-config --cflags)
+CPPFLAGS=-I/usr/include/postgresql $(shell freetype-config --cflags) -Itinyptc/
 CXXFLAGS=-g -Wall
 LDFLAGS=-L/usr/X11R6/lib
-LIBS=-lGL -lX11 -lXext -lXxf86vm $(shell freetype-config --libs) $(shell libpq3-config) -lpqxx
-CCBS_BIGSCREEN_OBJS=ccbs_bigscreen.o glwindow.o
+LIBS=$(shell freetype-config --libs) $(shell libpq3-config) -lpqxx tinyptc/libtinyptc.a -lX11 -lXext
+
+CCBS_BIGSCREEN_SQL_OBJS=fetch_current_tournament.o fetch_list_of_active_groups.o \
+       fetch_max_score_for_songs.o fetch_max_score_for_players.o fetch_group.o \
+       fetch_needs_update.o fetch_highscore.o fetch_top_scores_for_tournament.o \
+       fetch_auxilliary_screens.o
+CCBS_BIGSCREEN_SCREEN_OBJS=groupscreen.o top10scorescreen.o splitscreen.o rotatescreen.o screen.o
+CCBS_BIGSCREEN_MAIN_OBJS=ccbs_bigscreen.o flagtrigger.o widestring.o fonts.o
+CCBS_BIGSCREEN_OBJS=$(CCBS_BIGSCREEN_SQL_OBJS) $(CCBS_BIGSCREEN_SCREEN_OBJS) $(CCBS_BIGSCREEN_MAIN_OBJS)
 
 all: ccbs-bigscreen
 
-ccbs-bigscreen: $(CCBS_BIGSCREEN_OBJS)
+tinyptc/libtinyptc.a:
+       $(MAKE) -C tinyptc
+
+ccbs-bigscreen: $(CCBS_BIGSCREEN_OBJS) tinyptc/libtinyptc.a
        $(CXX) -o ccbs-bigscreen $(CCBS_BIGSCREEN_OBJS) $(LDFLAGS) $(LIBS)
 
 clean:
        $(RM) $(CCBS_BIGSCREEN_OBJS) ccbs-bigscreen
+       $(MAKE) -C tinyptc clean
 
 .PHONY: clean