[pclasses-cvs] pclasses2/src/System Makefile.toc,1.1,1.2

[stephan b. <sg...@us...>]

Update of /cvsroot/pclasses/pclasses2/src/System
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1508/System

Modified Files:
	Makefile.toc 
Log Message:
mass commit: most of the build works.

Index: Makefile.toc
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/src/System/Makefile.toc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.toc	23 Dec 2004 00:18:53 -0000	1.1
+++ Makefile.toc	23 Dec 2004 06:09:32 -0000	1.2
@@ -1,98 +1,83 @@
-###################################################
-# AUTO-GENERATED guess at a toc-aware Makefile,
-# based off of the contents of directory:
-#   ./src/System
-# Created by ./toc/bin/create_makefile_stubs.sh
-# Wed Dec 22 23:10:45 CET 2004
-# It must be tweaked to suit your needs.
-###################################################
+#!/usr/bin/make -f
+
 include toc.make
-############## FLEXES:
-# WARNING: FLEXES stuff only works for C++-based flexers
-FLEXES = 
-FLEXES_ARGS = -+ -p
-OBJECTS += 
-include $(TOC_MAKESDIR)/flex.make
-# Run target FLEXES to process these.
-# REMINDER: add the generated C++ files to your SOURCES, if needed.
-############## /FLEXES
+
 HEADERS = timeout.h
+
 DIST_FILES += $(HEADERS)
+
 INSTALL_PACKAGE_HEADERS += $(HEADERS)
 
-SOURCES = Condition.posix.cpp \
-	Condition.solaris.cpp \
-	Condition.win32.cpp \
+
+
+SOURCES_COMMON = \
 	CriticalSection.cpp \
 	CriticalSection.generic.cpp \
-	CriticalSection.win32.cpp \
-	File.posix.cpp \
 	Mutex.cpp \
+	SharedLib.dl.cpp \
+	SystemError.cpp \
+	timeout.cpp
+
+SOURCES_WTF = \
+	SharedLib.shl.cpp
+
+SOURCES_MACH = \
+	SharedLib.dyld.cpp
+
+SOURCES_SYSV = \
+	SharedMemory.sysv.cpp \
+	Semaphore.sysv.cpp
+
+SOURCES_SOLARIS = \
+	Condition.solaris.cpp \
+	Mutex.solaris.cpp
+
+SOURCES_POSIX = Condition.posix.cpp \
+	File.posix.cpp \
 	Mutex.posix.cpp \
-	Mutex.solaris.cpp \
-	Mutex.win32.cpp \
 	Pipe.posix.cpp \
-	Semaphore.posix.cpp \
-	Semaphore.sysv.cpp \
-	Semaphore.win32.cpp \
-	SharedLib.dl.cpp \
-	SharedLib.dyld.cpp \
-	SharedLib.shl.cpp \
-	SharedLib.win32.cpp \
 	SharedMemory.posix.cpp \
-	SharedMemory.sysv.cpp \
-	SystemError.cpp \
 	Thread.posix.cpp \
-	timeout.cpp
-DIST_FILES += $(SOURCES)
-OBJECTS = Condition.posix.o \
-	Condition.solaris.o \
-	Condition.win32.o \
-	CriticalSection.o \
-	CriticalSection.generic.o \
-	CriticalSection.win32.o \
-	File.posix.o \
-	Mutex.o \
-	Mutex.posix.o \
-	Mutex.solaris.o \
-	Mutex.win32.o \
-	Pipe.posix.o \
-	Semaphore.posix.o \
-	Semaphore.sysv.o \
-	Semaphore.win32.o \
-	SharedLib.dl.o \
-	SharedLib.dyld.o \
-	SharedLib.shl.o \
-	SharedLib.win32.o \
-	SharedMemory.posix.o \
-	SharedMemory.sysv.o \
-	SystemError.o \
-	Thread.posix.o \
-	timeout.o
+
+SOURCES_WIN32 = Condition.win32.cpp \
+	CriticalSection.win32.cpp \
+	Mutex.win32.cpp \
+	Semaphore.posix.cpp \
+	Semaphore.win32.cpp \
+	SharedLib.win32.cpp
+
+
+##############################################
+# TODO: use the config-mandated BUILD_SOURCES!
+BUILD_SOURCES = $(SOURCES_COMMON)
+BUILD_SOURCES += $(SOURCES_POSIX)
+##############################################
+
+DIST_FILES += $(wildcard *.cpp *.h)
+
+OBJECTS = \
+	$(patsubst %.cpp,%.o,$(BUILD_SOURCES))
 
 CLEAN_FILES += $(OBJECTS)
 
-build_libs = 0
+INCLUDES += $(LIBPSYSTEM_INCLUDES)
+LDADD += $(LIBPSYSTEM_LDADD)
+
+LIBNAME = libpsystem
+build_libs = 1
 ifeq (1,$(build_libs))
-  STATIC_LIBS = thislib
-  thislib_a_OBJECTS = $(OBJECTS)
-  thislib_so_OBJECTS = $(thislib_a_OBJECTS)
-  # thislib_so_VERSION = $(PACKAGE_VERSION)
+  STATIC_LIBS = $(LIBNAME)
+  SHARED_LIBS = $(STATIC_LIBS)
+  $(LIBNAME)_a_OBJECTS = $(OBJECTS)
+  $(LIBNAME)_so_OBJECTS = $($(LIBNAME)_a_OBJECTS)
+  $(LIBNAME)_so_VERSION = $(PACKAGE_VERSION)
+  #  $(LIBNAME)_so_LDADD = $(LIBPSYSTEM_LDADD)
   include $(TOC_MAKESDIR)/SHARED_LIBS.make
   include $(TOC_MAKESDIR)/STATIC_LIBS.make
   # Run targets STATIC_LIBS and SHARED_LIBS build these.
 endif
 
-build_bins = 0
-ifeq (1,$(build_bins))
-  BIN_PROGRAMS = thisbin
-  thisbin_bin_OBJECTS = $(OBJECTS)
-  include $(TOC_MAKESDIR)/BIN_PROGRAMS.make
-  INSTALL_BINS += $(BIN_PROGRAMS)
-  # Run target BIN_PROGRAMS to build these.
-endif
-
-all:
+all: STATIC_LIBS SHARED_LIBS
 ###################################################
 # end auto-generated rules
 ###################################################