[pclasses-cvs] pclasses2/src/System Makefile.toc,1.14,1.15

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

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

Modified Files:
	Makefile.toc 
Log Message:
Removed the conditional around the libs build - we always want them built.

Index: Makefile.toc
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/src/System/Makefile.toc,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Makefile.toc	28 Dec 2004 15:10:52 -0000	1.14
+++ Makefile.toc	28 Dec 2004 18:39:43 -0000	1.15
@@ -9,7 +9,6 @@
 INSTALL_PACKAGE_HEADERS = $(HEADERS)
 INSTALL_PACKAGE_HEADERS_DEST = $(INSTALL_PACKAGE_HEADERS_BASE)/System
 
-
 SOURCES_COMMON = \
 	CriticalSection.cpp \
 	CriticalSection.generic.cpp \
@@ -85,21 +84,17 @@
 
 # $(warning LIBPSYSTEM_LDADD=$(LIBPSYSTEM_LDADD))
 LIBNAME = lib$(LIBPSYSTEM_BASENAME)
-build_libs = 1
-ifeq (1,$(build_libs))
-  STATIC_LIBS = $(LIBNAME)
-  SHARED_LIBS = $(STATIC_LIBS)
+STATIC_LIBS = $(LIBNAME)
+SHARED_LIBS = $(STATIC_LIBS)
 #   SHARED_LIBS_LDADD = $(LIBPSYSTEM_LDADD)
-  $(LIBNAME)_a_OBJECTS = $(OBJECTS)
-  $(LIBNAME)_so_OBJECTS = $($(LIBNAME)_a_OBJECTS)
-  $(LIBNAME)_so_VERSION = $(PACKAGE_VERSION)
-  $(LIBNAME)_so_LDADD = $(P_BACKLINK_LDADD) $(LIBPSYSTEM_LDADD)
-# $(warning $(LIBNAME)_so_LDADD = $($(LIBNAME)_so_LDADD))
-  include $(TOC_MAKESDIR)/SHARED_LIBS.make
-  include $(TOC_MAKESDIR)/STATIC_LIBS.make
-  # Run targets STATIC_LIBS and SHARED_LIBS build these.
+$(LIBNAME)_a_OBJECTS = $(OBJECTS)
+$(LIBNAME)_so_OBJECTS = $($(LIBNAME)_a_OBJECTS)
+$(LIBNAME)_so_VERSION = $(PACKAGE_VERSION)
+$(LIBNAME)_so_LDADD = $(P_BACKLINK_LDADD) $(LIBPSYSTEM_LDADD)
+include $(TOC_MAKESDIR)/SHARED_LIBS.make
+include $(TOC_MAKESDIR)/STATIC_LIBS.make
 SHARED_LIBS: STATIC_LIBS 
-endif
+
 
 BIN_PROGRAMS = testPathFinder testMime
 testPathFinder_bin_OBJECTS = testPathFinder.o PathFinder.o
@@ -107,7 +102,5 @@
 include $(TOC_MAKESDIR)/BIN_PROGRAMS.make
 
 BIN_PROGRAMS: SHARED_LIBS
+
 all: SHARED_LIBS
-###################################################
-# end auto-generated rules
-###################################################