From: stephan b. <sg...@us...> - 2004-12-23 06:19:04
|
Update of /cvsroot/pclasses/pclasses2/src/Util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2916 Modified Files: Makefile.toc Log Message: it builds :) Index: Makefile.toc =================================================================== RCS file: /cvsroot/pclasses/pclasses2/src/Util/Makefile.toc,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile.toc 23 Dec 2004 06:09:33 -0000 1.2 +++ Makefile.toc 23 Dec 2004 06:18:56 -0000 1.3 @@ -12,34 +12,31 @@ SOURCES = ManagedThread.cpp \ ThreadPool.cpp \ WorkQueue.cpp + DIST_FILES += $(SOURCES) + OBJECTS = ManagedThread.o \ ThreadPool.o \ WorkQueue.o CLEAN_FILES += $(OBJECTS) -build_libs = 0 +INCLUDES += $(LIBPUTIL_INCLUDES) +build_libs = 1 +LIBNAME = libputil 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) include $(TOC_MAKESDIR)/SHARED_LIBS.make include $(TOC_MAKESDIR)/STATIC_LIBS.make # Run targets STATIC_LIBS and SHARED_LIBS build these. +SHARED_LIBS: STATIC_LIBS 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: SHARED_LIBS ################################################### # end auto-generated rules ################################################### |