Move glib library into a subdirectory, make all GLib include files include

Tue Jun 26 11:43:46 2001 Owen Taylor <otaylor@redhat.com> * configure.in Makefile.am *.[ch] glib/*.[ch] glib/Makefile.am: Move glib library into a subdirectory, make all GLib include files include as <glib/glist.h> * tests/testglib.c tests/testgdate.c tests/testgdateparser.c tests/timeloop.c tests/timeloop-basic.c: Move all tests into the tests/ subdirectory.
2025-09-08 00:48:45 +02:00 · 2001-06-26 16:01:21 +00:00
parent 2c9c0fabc8
commit 2fd6b001fb
162 changed files with 221 additions and 59167 deletions
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@

 AUTOMAKE_OPTIONS = 1.4

-SUBDIRS = . m4macros gobject gmodule gthread docs tests build
+SUBDIRS = . m4macros glib gobject gmodule gthread docs tests build

 INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@ \
 	-DG_DISABLE_DEPRECATED -DGLIB_COMPILATION
@@ -41,107 +41,6 @@ BUILT_EXTRA_DIST = 		\
 	glib.rc			\
 	glib.spec

-lib_LTLIBRARIES = libglib-1.3.la
-
-libglib_1_3_la_SOURCES = 	\
-	garray.c		\
-	gasyncqueue.c		\
-	gbacktrace.c		\
-	gcache.c		\
-	gcompletion.c		\
-	gconvert.c		\
-	gdataset.c		\
-	gdate.c         	\
-	gerror.c		\
-	gfileutils.c		\
-	ghash.c			\
-	ghook.c			\
-	giochannel.c    	\
-	glibintl.h		\
-	glist.c			\
-	gmain.c         	\
-	gmarkup.c		\
-	gmem.c			\
-	gmessages.c		\
-	gnode.c			\
-	gpattern.c		\
-	gprimes.c		\
-	gqsort.c		\
-	gqueue.c		\
-	grel.c			\
-	grand.c			\
-	gscanner.c		\
-	gshell.c		\
-	gslist.c		\
-	gstrfuncs.c		\
-	gstring.c		\
-	gthread.c       	\
-	gthreadpool.c   	\
-	gtimer.c		\
-	gtree.c			\
-	guniprop.c		\
-	gutf8.c			\
-	gunibreak.h		\
-	gunibreak.c		\
-	gunichartables.h	\
-	gunidecomp.h		\
-	gunidecomp.c		\
-	gutils.c
-
-EXTRA_libglib_1_3_la_SOURCES = \
-	giounix.c	\
-	giowin32.c	\
-	gspawn.c	\
-	gspawn-win32.c	\
-	gwin32.c
-
-glibincludedir=$(includedir)/glib-2.0
-glibinclude_HEADERS =   \
-	galloca.h	\
-	garray.h	\
-	gasyncqueue.h	\
-	gbacktrace.h	\
-	gcache.h	\
-	gcompletion.h	\
-	gconvert.h	\
-	gdataset.h	\
-	gdate.h		\
-	gerror.h	\
-	gfileutils.h	\
-	ghash.h		\
-	ghook.h		\
-	giochannel.h	\
-	glib.h 		\
-	glib-object.h	\
-	glist.h		\
-	gmacros.h	\
-	gmain.h		\
-	gmarkup.h	\
-	gmem.h		\
-	gmessages.h	\
-	gnode.h		\
-	gpattern.h	\
-	gprimes.h	\
-	gqsort.h	\
-	gquark.h	\
-	gqueue.h	\
-	grand.h		\
-	grel.h		\
-	gscanner.h	\
-	gshell.h	\
-	gslist.h	\
-	gspawn.h	\
-	gstrfuncs.h	\
-	gstring.h	\
-	gthread.h	\
-	gthreadpool.h	\
-	gtimer.h	\
-	gtree.h		\
-	gtypes.h	\
-	gunicode.h	\
-	gutils.h	\
-	gwin32.h
-
 configexecincludedir = $(libdir)/glib-2.0/include
 #configexecinclude_DATA = glibconfig.h

@@ -161,36 +60,6 @@ stamp-gc-h: config.status
 	CONFIG_FILES= CONFIG_HEADERS= CONFIG_OTHER=glibconfig.h ./config.status
 	echo timestamp > stamp-gc-h

-libglib_1_3_la_LIBADD = @GIO@ @GSPAWN@ @PLATFORMDEP@ @ICONV_LIBS@ @G_LIBS_EXTRA@
-libglib_1_3_la_DEPENDENCIES = @GIO@ @GSPAWN@ @PLATFORMDEP@ 
-
-
-if PLATFORM_WIN32
-no_undefined = -no-undefined
-endif
-if OS_WIN32
-# This requires a very new libtool
-export_symbols = -export-symbols glib.def
-endif
-
-libglib_1_3_la_LDFLAGS = \
-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-	-export-dynamic $(no_undefined) $(export_symbols)
-
-if OS_WIN32
-bin_PROGRAMS = gspawn-win32-helper
-gspawn_win32_helper_LDADD = libglib-1.3.la
-endif
-if ENABLE_TIMELOOP
-timeloop = timeloop
-endif
-noinst_PROGRAMS = testglib testgdate testgdateparser $(timeloop)
-testglib_LDADD = libglib-1.3.la
-testgdate_LDADD = libglib-1.3.la
-testgdateparser_LDADD = libglib-1.3.la
-if ENABLE_TIMELOOP
-timeloop_LDADD = libglib-1.3.la
-endif

 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = glib-2.0.pc gobject-2.0.pc gmodule-2.0.pc gthread-2.0.pc