From 0028d16aa0be2f194cf1c80187e389a4bc4973af Mon Sep 17 00:00:00 2001 From: Ron Pedde Date: Wed, 5 Apr 2006 05:11:28 +0000 Subject: [PATCH] update scanner and parser makefiles. Deps really have to be trimmed --- src/parser-driver.c | 3 +++ src/parser.mk | 4 ++-- src/scanner.mk | 6 +++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/parser-driver.c b/src/parser-driver.c index eea073ea..e4d6cca2 100644 --- a/src/parser-driver.c +++ b/src/parser-driver.c @@ -12,6 +12,9 @@ #include "db-generic.h" #include "err.h" #include "smart-parser.h" +#include "daapd.h" + +CONFIG config; void usage(void) { printf("Usage:\n\n parser [-t ] [-d ] \"phrase\"\n\n"); diff --git a/src/parser.mk b/src/parser.mk index 9dc0f773..b9de8294 100644 --- a/src/parser.mk +++ b/src/parser.mk @@ -1,8 +1,8 @@ CC=gcc -CFLAGS := $(CFLAGS) -g -I/opt/local/include -DHAVE_CONFIG_H -I. -I.. -Wall -DERR_LEAN -DHAVE_SQL +CFLAGS := $(CFLAGS) -g -I/opt/local/include -DHAVE_CONFIG_H -I. -I.. -Wall -DHAVE_SQL -no-cpp-precomp -DMAC -DHOST='"argh"' LDFLAGS := $(LDFLAGS) -L/opt/local/lib -lsqlite -lsqlite3 TARGET=parser -OBJECTS=parser-driver.o smart-parser.o err.o db-sql.o db-generic.o ssc.o db-sql-sqlite3.o db-sql-sqlite2.o conf.o ll.o +OBJECTS=parser-driver.o smart-parser.o err.o db-sql.o db-generic.o ssc.o db-sql-sqlite3.o db-sql-sqlite2.o conf.o ll.o xml-rpc.o webserver.o uici.o os-unix.o restart.o configfile.o rend-win32.o $(TARGET): $(OBJECTS) $(CC) -o $(TARGET) $(LDFLAGS) $(OBJECTS) diff --git a/src/scanner.mk b/src/scanner.mk index 2bb91802..42d0a669 100644 --- a/src/scanner.mk +++ b/src/scanner.mk @@ -1,8 +1,8 @@ CC=gcc -CFLAGS := $(CFLAGS) -g -I/opt/local/include -DHAVE_CONFIG_H -I. -I.. -LDFLAGS := $(LDFLAGS) -L/opt/local/lib -lid3tag -logg -lvorbisfile -lFLAC -lvorbis -ltag_c +CFLAGS := $(CFLAGS) -g -I/opt/local/include -DHAVE_CONFIG_H -I. -I.. -DHOST='"foo"' -DHAVE_SQL +LDFLAGS := $(LDFLAGS) -L/opt/local/lib -lid3tag -logg -lvorbisfile -lFLAC -lvorbis -ltag_c -lsqlite -lsqlite3 TARGET = scanner -OBJECTS=scanner-driver.o restart.o err.o scan-wma.o scan-aac.o scan-wav.o scan-flac.o scan-ogg.o scan-mp3.o scan-url.o scan-mpc.o os-unix.o conf.o ll.o +OBJECTS=scanner-driver.o restart.o err.o scan-wma.o scan-aac.o scan-wav.o scan-flac.o scan-ogg.o scan-mp3.o scan-url.o scan-mpc.o os-unix.o conf.o ll.o xml-rpc.o webserver.o uici.o rend-win32.o configfile.o db-generic.o ssc.o db-sql-sqlite3.o db-sql-sqlite2.o db-sql.o smart-parser.o $(TARGET): $(OBJECTS) $(CC) -o $(TARGET) $(LDFLAGS) $(OBJECTS)