dslinux/lib/flnx Makefile

[amadeus]

Update of /cvsroot/dslinux/dslinux/lib/flnx
In directory antilope:/tmp/cvs-serv19823/lib/flnx

Modified Files:
	Makefile 
Log Message:


Index: Makefile
===================================================================
RCS file: /cvsroot/dslinux/dslinux/lib/flnx/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile	24 Aug 2006 15:09:10 -0000	1.1
+++ Makefile	29 Aug 2006 19:31:47 -0000	1.2
@@ -2,12 +2,11 @@
 # ============================
 
 # Special compiler options
-CFLAGS += -DPDA -DNANO_X -I./FL -I./src -I. -I$(ROOTDIR)/include/microwin
-CFLAGS += -D'NANOXFOLDER="/usr/bin"'
+CXXFLAGS += -DPDA -DNANO_X -I./FL -I./src -I$(ROOTDIR)/include/microwin
+CXXFLAGS += -D'NANOXFOLDER="/usr/bin"'
 
 # Header files
 INCS   := $(wildcard FL/*)
-INCS   += config.h
 
 # Object files
 CXX_OBJS := $(patsubst %.cxx,%.o,$(wildcard src/*.cxx))
@@ -17,10 +16,10 @@
 all: libfltk.a
 
 $(CXX_OBJS): %.o: %.cxx $(INCS)
-	$(CC) $(CFLAGS) -c $< -o $@
+	$(CXX) $(CXXFLAGS) -c $< -o $@
 
 $(C_OBJS): %.o: %.c $(INCS)
-	$(CC) $(CFLAGS) -c $< -o $@
+	$(CXX) $(CXXFLAGS) -c $< -o $@
 
 libfltk.a: $(C_OBJS) $(CXX_OBJS)
 	$(AR) rv $@ $(C_OBJS) $(CXX_OBJS)