Changeset 516 for branches/htmlform

Timestamp:

10/17/12 17:19:50 (12 years ago)

Author:

Kris Deugau

Message:

/branches/htmlform

Update and shuffle the file listings in the Makefile to match all
the new templates. MANIFEST is now constructed from the other
lists, rather duplicating things.
Make sure "make install" actually installs all current files.
See #3.

File:

• branches/htmlform/Makefile (modified) (3 diffs)

branches/htmlform/Makefile

@@ -28 +28 @@
 DESTDIR =
 
-MANIFEST = \
-        INSTALL COPYING Makefile ipdb.spec \
-        \
-        alloctypes.html \
-        help.html index.shtml ipdb.css \
-        images/logo.png \
-        \
-        cgi-bin/combineblocks.pl cgi-bin/access-pwd-update.pl \
-        cgi-bin/newnode.cgi cgi-bin/CustIDCK.pm cgi-bin/freespace.pl \
-        cgi-bin/admin.cgi cgi-bin/MyIPDB.pm cgi-bin/IPDB.pm \
-        cgi-bin/main.cgi cgi-bin/checkcusts.pl cgi-bin/newcity.cgi \
-        cgi-bin/allocate.pl cgi-bin/search.cgi \
-        cgi-bin/snCalc.cgi cgi-bin/ipdb.psql \
-        cgi-bin/consistency-check.pl \
-        \
-        cgi-bin/extras/db2rwhois.pl cgi-bin/extras/rwhois-net-skel.tar.gz cgi-bin/extras/rwhois-config \
-        cgi-bin/extras/network.tmpl
+HTML = \
+        alloctypes.html help.html index.shtml ipdb.css
 
-HTML = \
-        alloctypes.html \
-        help.html index.shtml ipdb.css
+JS = templates/widgets.js
 
 IMAGES = images/logo.png
+
+TEMPLATES = \
+        templates/aclerror.tmpl templates/addmaster.tmpl templates/assign.tmpl templates/confirm.tmpl \
+        templates/dberr.tmpl templates/delete.tmpl templates/dunno.tmpl templates/edit.tmpl \
+        templates/finaldelete.tmpl templates/footer.tmpl templates/header.tmpl templates/index.tmpl \
+        templates/insert.tmpl templates/listpool.tmpl templates/newcity.tmpl templates/newmaster.tmpl \
+        templates/newnode.tmpl templates/nodesearch.tmpl templates/showmaster.tmpl templates/showrouted.tmpl \
+        templates/subnet-calc.tmpl templates/update.tmpl \
+        \
+        templates/admin/aclerr.tmpl templates/admin/addnotice.tmpl templates/admin/alloc.tmpl \
+        templates/admin/alloctweak.tmpl templates/admin/confirm.tmpl templates/admin/dberr.tmpl \
+        templates/admin/delnotice.tmpl templates/admin/deluser.tmpl templates/admin/dunno.tmpl \
+        templates/admin/edcust.tmpl templates/admin/ednotice.tmpl templates/admin/emailnotice.tmpl \
+        templates/admin/header.tmpl templates/admin/listcust.tmpl templates/admin/main.tmpl \
+        templates/admin/newuser.tmpl templates/admin/showallocs.tmpl templates/admin/showpools.tmpl \
+        templates/admin/showusers.tmpl templates/admin/touch.tmpl templates/admin/tweakpool.tmpl \
+        templates/admin/updacl.tmpl templates/admin/updatepool.tmpl templates/admin/update.tmpl \
+        templates/admin/updcust.tmpl templates/admin/updnotice.tmpl \
+        \
+        templates/search/compsearch.tmpl templates/search/sresults.tmpl
 
 SCRIPTS = \
@@ -63 +66 @@
 
 RWHOIS = \
-        cgi-bin/extras/db2rwhois.pl cgi-bin/extras/rwhois-net-skel.tar.gz cgi-bin/extras/rwhois-config \
+        cgi-bin/extras/rwhois-net-skel.tar.gz cgi-bin/extras/rwhois-config \
         cgi-bin/extras/network.tmpl
 
-DIRS = images cgi-bin cgi-bin/extras
+DIRS = images templates cgi-bin cgi-bin/extras
 
-# hmm.  not sure what do do about you, m'friend...
-#ip@
+MANIFEST = \
+        $(HTML) \
+        $(JS) \
+        $(IMAGES) \
+        $(TEMPLATES) \
+        $(SCRIPTS) \
+        $(MODULES) \
+        $(CONFIGMODULES) \
+        $(RWHOIS)
 
 all:
@@ -75 +85 @@
 
 install:
-        @for i in $(HTML) $(IMAGES); do \
+        @for i in $(HTML) $(IMAGES) $(JS) $(TEMPLATES); do \
                 $(INSTALL_DATA) -D $$i $(DESTDIR)${libdir}/ipdb-$(VERSION)/$$i ; \
         done