Changeset 8906

Timestamp:

Sep 22, 2006, 5:03:14 PM (20 years ago)

Author:

jhoblitt

Message:

create utils dir and move relevant utils & scripts into it
properly install shared data

Location:

trunk/psLib

Files:

• Makefile.am (modified) (3 diffs)
• configure.ac (modified) (2 diffs)
• psParseErrorCodes (deleted)
• psParsePrecessionTable (deleted)
• psTableParse.c (deleted)
• share/Makefile.am (added)
• src/sys/Makefile.am (modified) (1 diff)
• utils (added)
• utils/Makefile.am (added)
• utils/psParseErrorCodes (added)
• utils/psParsePrecessionTable (added)
• utils/psTableParse.c (added)

trunk/psLib/Makefile.am

@@ -1 +1 @@
 SUBDIRS = $(SUBDIR)
 
-bin_SCRIPTS = pslib-config psParseErrorCodes
-
-bin_PROGRAMS = psTableParse
-
+bin_SCRIPTS = pslib-config 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA= pslib.pc
@@ -12 +9 @@
     pslib-config.in \
     pslib.pc.in \
-    share \
-    psParseErrorCodes \
-    psParsePrecessionTable \
     autogen.sh
-
-psTableParse_SOURCES = psTableParse.c
 
 if DOXYGEN
@@ -32 +24 @@
         mkdir -p -m 744 $(mandir)/man3
 
-$(datadir)/pslib:
-        if [ -d $(datadir) ] ; then chmod u+w $(datadir) ; fi
-        mkdir -p -m 744 $(datadir)/pslib
-
-$(sysconfdir)/pslib:
-        if [ -d $(sysconfdir) ] ; then chmod u+w $(sysconfdir) ; fi
-        mkdir -p -m 744 $(sysconfdir)/pslib
-
-install-data-hook: $(datadir)/pslib $(sysconfdir)/pslib
-        if [ `pwd`/share != $(datadir) ] ; then $(INSTALL_DATA) $(srcdir)/share/pslib/*.dat $(datadir)/pslib ; fi
-        if [ `pwd`/etc != $(sysconfdir) ] ; then  $(INSTALL_DATA) $(srcdir)/etc/pslib/psTime.xml etc/pslib/pslib.config $(sysconfdir)/pslib ; fi
-
-uninstall-hook:
-        if [ `pwd`/share != $(datadir) ] ; then rm -rf $(datadir)/pslib ; fi
-        if [ `pwd`/etc != $(sysconfdir) ] ; then  rm -rf $(sysconfdir)/pslib ; fi
-        rm -rf $(prefix)/docs/pslib/*
-
 CLEANFILES = $(prefix)/docs/pslib/* *~ *.bb *.bbg *.da
 

trunk/psLib/configure.ac

@@ -26 +26 @@
     AC_SUBST(PERL,$PERL)
 
-SUBDIR="etc src test" dnl don't include 'swig', as it is optional
+SUBDIR="etc src test utils" dnl don't include 'swig', as it is optional
 
 SRCPATH='${top_srcdir}/src'
@@ -413 +413 @@
   test/pstap/Makefile
   test/pstap/src/Makefile
+  utils/Makefile
   etc/Makefile
+  share/Makefile
   pslib-config
   pslib.pc

trunk/psLib/src/sys/Makefile.am

@@ -20 +20 @@
 
 psErrorCodes.c: ../psErrorCodes_$(PS_LANG).dat psErrorCodes.c.in psErrorCodes.h
-        $(top_srcdir)/psParseErrorCodes --data=../psErrorCodes_$(PS_LANG).dat $@
+        $(top_srcdir)/utils/psParseErrorCodes --data=../psErrorCodes_$(PS_LANG).dat $@
 
 psError.h: psErrorCodes.h
 
 psErrorCodes.h: ../psErrorCodes_$(PS_LANG).dat psErrorCodes.h.in
-        $(top_srcdir)/psParseErrorCodes --data=../psErrorCodes_$(PS_LANG).dat $@
+        $(top_srcdir)/utils/psParseErrorCodes --data=../psErrorCodes_$(PS_LANG).dat $@
 
 pslibincludedir = $(includedir)