Changeset 73

Timestamp:

07/30/06 21:15:56 (18 years ago)

Author:

tim

Message:

fixes for Makefiles to support FreeBSD's iconv

Location:

trunk

Files:

• Makefile (modified) (1 diff)
• lib/Makefile (modified) (1 diff)
• src/Makefile (modified) (1 diff)

trunk/Makefile

@@ -12 +12 @@
 CC=gcc
 OPTS=-std=gnu89 -pedantic -Wall
+INC=-I/usr/local/include
+LIB=-L/usr/local/lib
+
+UNAME := $(shell uname)
+ifeq ($(UNAME),FreeBSD)         
+  LIB=$(LIB) -liconv
+endif
 
 BUILD=$(CURDIR)/build

trunk/lib/Makefile

@@ -8 +8 @@
 
 regfio.o: regfio.c
-        $(CC) $(CFLAGS) $(OPTS) -c -o $@ regfio.c
+        $(CC) $(CFLAGS) $(OPTS) $(INC) -c -o $@ regfio.c
 
 smb_deps.o: smb_deps.c
-        $(CC) $(CFLAGS) $(OPTS) -c -o $@ smb_deps.c
+        $(CC) $(CFLAGS) $(OPTS) $(INC) -c -o $@ smb_deps.c
 
 void_stack.o: void_stack.c
-        $(CC) $(CFLAGS) $(OPTS) -c -o $@ void_stack.c
+        $(CC) $(CFLAGS) $(OPTS) $(INC) -c -o $@ void_stack.c
 
 clean:

trunk/src/Makefile

@@ -4 +4 @@
 
 REGLOOKUP=$(BUILD_BIN)/reglookup
-LIBS=$(wildcard ../lib/*.o)
+OBJ=$(wildcard ../lib/*.o)
 FILES=$(REGLOOKUP)
 
 all: $(FILES)
 
-$(REGLOOKUP): reglookup.o $(LIBS)
-        $(CC) $(CFLAGS) $(OPTS) -o $@ reglookup.o $(LIBS)
+$(REGLOOKUP): reglookup.o $(OBJ)
+        $(CC) $(CFLAGS) $(OPTS) $(LIB) -o $@ reglookup.o $(OBJ)
 
 reglookup.o: reglookup.c
-        $(CC) $(CFLAGS) $(OPTS) -c -o $@ reglookup.c
+        $(CC) $(CFLAGS) $(OPTS) $(INC) -c -o $@ reglookup.c
 
 install: